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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/power/tray_power.cc ('k') | ash/system/settings/tray_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/settings/tray_settings.h
diff --git a/ash/system/settings/tray_settings.h b/ash/system/settings/tray_settings.h
index 18536fe051bfd1006e02dac0599017ec0d60e403..1b9ca97e757439924edf5817afaea603ca6eccb0 100644
--- a/ash/system/settings/tray_settings.h
+++ b/ash/system/settings/tray_settings.h
@@ -6,12 +6,18 @@
#define ASH_SYSTEM_SETTINGS_TRAY_SETTINGS_H_
#pragma once
+#include "ash/system/power/power_status_observer.h"
#include "ash/system/tray/system_tray_item.h"
namespace ash {
namespace internal {
-class TraySettings : public SystemTrayItem {
+namespace tray {
+class SettingsDefaultView;
+}
+
+class TraySettings : public SystemTrayItem,
+ public PowerStatusObserver {
public:
TraySettings();
virtual ~TraySettings();
@@ -26,6 +32,11 @@ class TraySettings : public SystemTrayItem {
virtual void DestroyDetailedView() OVERRIDE;
virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
+ // Overridden from PowerStatusObserver.
+ virtual void OnPowerStatusChanged(const PowerSupplyStatus& status) OVERRIDE;
+
+ tray::SettingsDefaultView* default_view_;
+
DISALLOW_COPY_AND_ASSIGN(TraySettings);
};
« 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