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

Unified Diff: ash/system/tray/tray_empty.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/tray/tray_empty.cc
diff --git a/ash/system/tray/tray_empty.cc b/ash/system/tray/tray_empty.cc
index 670618d42fe67d56b985ab03726acd48b2e10715..eba3ae8547f0bc0186769287aaf7f83b575dc5ea 100644
--- a/ash/system/tray/tray_empty.cc
+++ b/ash/system/tray/tray_empty.cc
@@ -4,6 +4,7 @@
#include "ash/system/tray/tray_empty.h"
+#include "ash/system/tray/system_tray.h"
#include "ui/views/layout/box_layout.h"
#include "ui/views/background.h"
#include "ui/views/view.h"
@@ -27,7 +28,9 @@ class EmptyBackground : public views::Background {
namespace ash {
namespace internal {
-TrayEmpty::TrayEmpty() {}
+TrayEmpty::TrayEmpty(SystemTray* system_tray)
+ : SystemTrayItem(system_tray) {
+}
TrayEmpty::~TrayEmpty() {}

Powered by Google App Engine
This is Rietveld 408576698