chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.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: chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.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:

View side-by-side diff with in-line comments

Download patch

« ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('K') | « chrome/browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc ('k') | chrome/browser/ui/ash/vpn_delegate_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

diff --git a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

index 885f837b57aaecda182545245b0126290ea06f05..c8966e81dc73a36fa75f3e7e24e494c4c5a7b7f7 100644

--- a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

+++ b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

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

#include <vector>

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

+#include "ash/common/wm_shell.h"

#include "ash/shell.h"

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

#include "ash/test/tray_cast_test_api.h"

@@ -96,9 +97,8 @@ class SystemTrayTrayCastMediaRouterChromeOSTest : public InProcessBrowserTest {

// Sanity check to make sure that the media router delegate is getting used.

IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastMediaRouterChromeOSTest,

VerifyThatMediaRouterIsBeingUsed) {

- ash::CastConfigDelegate* cast_config_delegate = ash::Shell::GetInstance()

- ->system_tray_delegate()

- ->GetCastConfigDelegate();

+ ash::CastConfigDelegate* cast_config_delegate =

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

// The media router always reports false for HasOptions(); the extension

// always reports true.