ash/system/chromeos/tray_display.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/chromeos/tray_display.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/chromeos/tray_display.h

diff --git a/ash/system/chromeos/tray_display.h b/ash/system/chromeos/tray_display.h

index 0685a9de29dc3c50e2b5e44f3c86256a80ad8532..4fc85516dcfcd363c9b417180efade3770b14c33 100644

--- a/ash/system/chromeos/tray_display.h

+++ b/ash/system/chromeos/tray_display.h

@@ -17,6 +17,8 @@ class View;

namespace ash {

+class SystemTray;

namespace internal {

class DisplayView;

@@ -24,7 +26,7 @@ class TrayDisplay : public SystemTrayItem,

public chromeos::OutputConfigurator::Observer,

public gfx::DisplayObserver {

public:

- TrayDisplay();

+ explicit TrayDisplay(SystemTray* system_tray);

virtual ~TrayDisplay();

private: