Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(475)

Side by Side Diff: ash/system/settings/tray_settings.h

Issue 10540041: Add battery status to settings row in uber tray bubble. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits. Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/system/power/tray_power.cc ('k') | ash/system/settings/tray_settings.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SYSTEM_SETTINGS_TRAY_SETTINGS_H_ 5 #ifndef ASH_SYSTEM_SETTINGS_TRAY_SETTINGS_H_
6 #define ASH_SYSTEM_SETTINGS_TRAY_SETTINGS_H_ 6 #define ASH_SYSTEM_SETTINGS_TRAY_SETTINGS_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/system/power/power_status_observer.h"
9 #include "ash/system/tray/system_tray_item.h" 10 #include "ash/system/tray/system_tray_item.h"
10 11
11 namespace ash { 12 namespace ash {
12 namespace internal { 13 namespace internal {
13 14
14 class TraySettings : public SystemTrayItem { 15 namespace tray {
16 class SettingsDefaultView;
17 }
18
19 class TraySettings : public SystemTrayItem,
20 public PowerStatusObserver {
15 public: 21 public:
16 TraySettings(); 22 TraySettings();
17 virtual ~TraySettings(); 23 virtual ~TraySettings();
18 24
19 private: 25 private:
20 // Overridden from SystemTrayItem 26 // Overridden from SystemTrayItem
21 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 27 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
22 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 28 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
23 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 29 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
24 virtual void DestroyTrayView() OVERRIDE; 30 virtual void DestroyTrayView() OVERRIDE;
25 virtual void DestroyDefaultView() OVERRIDE; 31 virtual void DestroyDefaultView() OVERRIDE;
26 virtual void DestroyDetailedView() OVERRIDE; 32 virtual void DestroyDetailedView() OVERRIDE;
27 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 33 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
28 34
35 // Overridden from PowerStatusObserver.
36 virtual void OnPowerStatusChanged(const PowerSupplyStatus& status) OVERRIDE;
37
38 tray::SettingsDefaultView* default_view_;
39
29 DISALLOW_COPY_AND_ASSIGN(TraySettings); 40 DISALLOW_COPY_AND_ASSIGN(TraySettings);
30 }; 41 };
31 42
32 } // namespace internal 43 } // namespace internal
33 } // namespace ash 44 } // namespace ash
34 45
35 #endif // ASH_SYSTEM_SETTINGS_TRAY_SETTINGS_H_ 46 #endif // ASH_SYSTEM_SETTINGS_TRAY_SETTINGS_H_
OLDNEW
« no previous file with comments | « ash/system/power/tray_power.cc ('k') | ash/system/settings/tray_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698