ash/system/tray_caps_lock.cc - Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Removed unnecessary forward declarations. Renamed |tray| to |owner|. 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:

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..e355317638beb2e52333e1740b98103872053961 100644

--- a/ash/system/tray_caps_lock.cc

+++ b/ash/system/tray_caps_lock.cc

@@ -102,8 +102,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),