ash/system/cast/tray_cast.cc - Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell

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/cast/tray_cast.cc

Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review feedback Created 4 years, 6 months 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/cast/tray_cast.cc

diff --git a/ash/system/cast/tray_cast.cc b/ash/system/cast/tray_cast.cc

index fe95125dbaf233b9f613913b5b03639a0c940dd3..3339da87c7ce38228819376cdb2251396176bca2 100644

--- a/ash/system/cast/tray_cast.cc

+++ b/ash/system/cast/tray_cast.cc

@@ -45,9 +45,7 @@ const int kStopButtonRightPadding = 18;

// Returns the active CastConfigDelegate instance.

ash::CastConfigDelegate* GetCastConfigDelegate() {

- return ash::Shell::GetInstance()

- ->system_tray_delegate()

- ->GetCastConfigDelegate();

+ return WmShell::Get()->system_tray_delegate()->GetCastConfigDelegate();

}

// Helper method to elide the given string to the maximum length. If a string is