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

Unified Diff: ash/system/logout_button/tray_logout_button.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/logout_button/tray_logout_button.h
diff --git a/ash/system/logout_button/tray_logout_button.h b/ash/system/logout_button/tray_logout_button.h
index ca51d9ddbb0e23bd305f22d9e3bf6030ae65b8d5..7483c62b154885607b0f372edd670dc2e54c720d 100644
--- a/ash/system/logout_button/tray_logout_button.h
+++ b/ash/system/logout_button/tray_logout_button.h
@@ -11,6 +11,9 @@
#include "base/compiler_specific.h"
namespace ash {
+
+class SystemTray;
+
namespace internal {
namespace tray {
@@ -21,7 +24,7 @@ class LogoutButton;
// kShowLogoutButtonInTray pref.
class TrayLogoutButton : public SystemTrayItem, public LogoutButtonObserver {
public:
- TrayLogoutButton();
+ explicit TrayLogoutButton(SystemTray* system_tray);
// Overridden from SystemTrayItem.
virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698