ash/system/settings/tray_settings.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/settings/tray_settings.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/settings/tray_settings.cc

diff --git a/ash/system/settings/tray_settings.cc b/ash/system/settings/tray_settings.cc

index ae1823d4e16b53ca96e607fac2c71dc76d0a2aa9..ed566d64b25b71b4cfbcc1f4047c59ec74829088 100644

--- a/ash/system/settings/tray_settings.cc

+++ b/ash/system/settings/tray_settings.cc

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

#include "ash/shell.h"

#include "ash/system/power/power_status_view.h"

+#include "ash/system/tray/system_tray.h"

#include "ash/system/tray/system_tray_delegate.h"

#include "ash/system/tray/tray_constants.h"

#include "ash/system/tray/tray_views.h"

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

} // namespace tray

-TraySettings::TraySettings()

- : default_view_(NULL) {

+TraySettings::TraySettings(SystemTray* system_tray)

+ : SystemTrayItem(system_tray),

+ default_view_(NULL) {

}

TraySettings::~TraySettings() {}