ash/system/tray/tray_item_more.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/tray_item_more.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/tray_item_more.cc

diff --git a/ash/system/tray/tray_item_more.cc b/ash/system/tray/tray_item_more.cc

index 2a51a86ff2422f633953106457e58db8a5b55411..4c6e976798af3aa0df6d91eb01fe4a4c34b21d50 100644

--- a/ash/system/tray/tray_item_more.cc

+++ b/ash/system/tray/tray_item_more.cc

@@ -18,8 +18,8 @@

namespace ash {

namespace internal {

-TrayItemMore::TrayItemMore(SystemTrayItem* owner, bool show_more)

- : owner_(owner),

+TrayItemMore::TrayItemMore(SystemTrayItem* tray, bool show_more)

+ : tray_(tray),

show_more_(show_more),

icon_(NULL),

label_(NULL),

@@ -70,7 +70,7 @@ bool TrayItemMore::PerformAction(const ui::Event& event) {

if (!show_more_)

return false;

- owner_->TransitionDetailedView();

+ tray()->TransitionDetailedView();

return true;

}