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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/tray_caps_lock.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
« ash/system/tray/system_tray_item.h ('K') | « ash/system/tray_caps_lock.h ('k') | ash/system/tray_update.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray_caps_lock.cc
diff --git a/ash/system/tray_caps_lock.cc b/ash/system/tray_caps_lock.cc
index a570664abeecf39ca06b446172117a16d7d2c736..1f32c6ee9c982d713697ee1ecd0a530da0fa2190 100644
--- a/ash/system/tray_caps_lock.cc
+++ b/ash/system/tray_caps_lock.cc
@@ -6,6 +6,7 @@
#include "ash/caps_lock_delegate.h"
#include "ash/shell.h"
+#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/tray_views.h"
#include "grit/ash_resources.h"
@@ -102,8 +103,8 @@ class CapsLockDefaultView : public ActionableView {
DISALLOW_COPY_AND_ASSIGN(CapsLockDefaultView);
};
-TrayCapsLock::TrayCapsLock()
- : TrayImageItem(IDR_AURA_UBER_TRAY_CAPS_LOCK),
+TrayCapsLock::TrayCapsLock(SystemTray* system_tray)
+ : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_CAPS_LOCK),
default_(NULL),
detailed_(NULL),
search_mapped_to_caps_lock_(false),
« ash/system/tray/system_tray_item.h ('K') | « ash/system/tray_caps_lock.h ('k') | ash/system/tray_update.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698