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

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

index bf958d6063c2e0f6d2dab13cc7d1bb66b547ee00..ea0edf2c40b41b2b9553b86f9ede6b89830fb449 100644

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

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

@@ -114,8 +114,9 @@ class DisplayView : public ash::internal::ActionableView {

DISALLOW_COPY_AND_ASSIGN(DisplayView);

};

-TrayDisplay::TrayDisplay()

- : default_(NULL) {

+TrayDisplay::TrayDisplay(SystemTray* system_tray)

+ : SystemTrayItem(system_tray),

+ default_(NULL) {

Shell::GetScreen()->AddObserver(this);

Shell::GetInstance()->output_configurator()->AddObserver(this);

}