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

Unified Diff: ash/system/logout_button/tray_logout_button.cc

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.cc
diff --git a/ash/system/logout_button/tray_logout_button.cc b/ash/system/logout_button/tray_logout_button.cc
index 896f6016e841e4a4cdae7fc92c2ed0806995f272..c609190d4d98a6b76336ebe37f6b854a0e7343ef 100644
--- a/ash/system/logout_button/tray_logout_button.cc
+++ b/ash/system/logout_button/tray_logout_button.cc
@@ -7,6 +7,7 @@
#include <cstddef>
#include "ash/shell.h"
+#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/system/user/login_status.h"
#include "base/logging.h"
@@ -116,7 +117,9 @@ class LogoutButton : public views::LabelButton,
} // namespace tray
-TrayLogoutButton::TrayLogoutButton() : logout_button_(NULL) {
+TrayLogoutButton::TrayLogoutButton(SystemTray* system_tray)
+ : SystemTrayItem(system_tray),
+ logout_button_(NULL) {
}
views::View* TrayLogoutButton::CreateTrayView(user::LoginStatus status) {

Powered by Google App Engine
This is Rietveld 408576698