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

Unified Diff: ash/system/settings/tray_settings.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
Index: ash/system/settings/tray_settings.h
diff --git a/ash/system/settings/tray_settings.h b/ash/system/settings/tray_settings.h
index 9bfeca3ffdd31ffbed1bc5e4d03d908f75aaaf3b..2754f369b322478cae4abcaf04d9b1e15a501507 100644
--- a/ash/system/settings/tray_settings.h
+++ b/ash/system/settings/tray_settings.h
@@ -9,6 +9,9 @@
#include "ash/system/tray/system_tray_item.h"
namespace ash {
+
+class SystemTray;
+
namespace internal {
namespace tray {
@@ -18,7 +21,7 @@ class SettingsDefaultView;
class TraySettings : public SystemTrayItem,
public PowerStatusObserver {
public:
- TraySettings();
+ explicit TraySettings(SystemTray* system_tray);
virtual ~TraySettings();
private:

Powered by Google App Engine
This is Rietveld 408576698