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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/power/tray_power.h

Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modified CL to provide TrayItems and Tray*Views with parent pointers instead. Created 8 years, 1 month 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
« ash/system/bluetooth/tray_bluetooth.cc ('K') | « ash/system/monitor/tray_monitor.cc ('k') | ash/system/power/tray_power.cc » ('j') | ash/system/tray/system_tray_item.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/power/tray_power.h
diff --git a/ash/system/power/tray_power.h b/ash/system/power/tray_power.h
index 91ebf74b99402b671a3c785d19c34e7b8cdc9a20..7e6af7101685068aee02f0655e198b3d35417045 100644
--- a/ash/system/power/tray_power.h
+++ b/ash/system/power/tray_power.h
@@ -15,6 +15,9 @@ class ImageSkia;
}
namespace ash {
+
+class SystemTray;
+
namespace internal {
namespace tray {
@@ -30,7 +33,7 @@ enum IconSet {
class TrayPower : public SystemTrayItem,
public PowerStatusObserver {
public:
- TrayPower();
+ explicit TrayPower(SystemTray* system_tray);
virtual ~TrayPower();
// Gets the icon index in the battery icon array image based on
« ash/system/bluetooth/tray_bluetooth.cc ('K') | « ash/system/monitor/tray_monitor.cc ('k') | ash/system/power/tray_power.cc » ('j') | ash/system/tray/system_tray_item.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698