ash/system/tray_accessibility.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_accessibility.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:

Index: ash/system/tray_accessibility.cc

diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc

index 7b7a3be9457193802436c86164e326205bca91a5..b14456ac1748ce5b442c79bdce150ffc9505ad4e 100644

--- a/ash/system/tray_accessibility.cc

+++ b/ash/system/tray_accessibility.cc

@@ -6,6 +6,7 @@

#include "ash/shell.h"

#include "ash/shell_delegate.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"

@@ -57,8 +58,8 @@ class DefaultAccessibilityView : public ActionableView {

DISALLOW_COPY_AND_ASSIGN(DefaultAccessibilityView);

};

-TrayAccessibility::TrayAccessibility()

- : TrayImageItem(IDR_AURA_UBER_TRAY_ACCESSIBILITY),

+TrayAccessibility::TrayAccessibility(SystemTray* system_tray)

+ : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_ACCESSIBILITY),

default_(NULL),

detailed_(NULL) {

}