ash/system/monitor/tray_monitor.h - 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/monitor/tray_monitor.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:

Index: ash/system/monitor/tray_monitor.h

diff --git a/ash/system/monitor/tray_monitor.h b/ash/system/monitor/tray_monitor.h

index c397df4cb044693061df853d7a1effdc5ec20266..1aee19c0dbb5c7b50263a565129164769521b12e 100644

--- a/ash/system/monitor/tray_monitor.h

+++ b/ash/system/monitor/tray_monitor.h

@@ -13,11 +13,14 @@ class Label;

}

namespace ash {

+class SystemTray;

namespace internal {

class TrayMonitor : public SystemTrayItem {

public:

- TrayMonitor();

+ explicit TrayMonitor(SystemTray* system_tray);

virtual ~TrayMonitor();

private: