Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Unified Diff: chrome/browser/ui/ash/system_tray_tray_cast_browsertest_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
Index: chrome/browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc
index 905f89f83404aa257f43eb1031ba3fd1db77e2ea..b9f1266b76238c78523028f53ffbcb3649a1729f 100644
--- a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/system/cast/tray_cast.h"
#include "ash/system/tray/system_tray.h"
@@ -158,9 +159,8 @@ namespace chromeos {
// recognizes the cast extension.
IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastChromeOSTest,
CastTraySanityCheckTestExtensionGetsRecognized) {
- ash::CastConfigDelegate* cast_config_delegate = ash::Shell::GetInstance()
- ->system_tray_delegate()
- ->GetCastConfigDelegate();
+ ash::CastConfigDelegate* cast_config_delegate =
+ ash::WmShell::Get()->system_tray_delegate()->GetCastConfigDelegate();
EXPECT_FALSE(cast_config_delegate->HasCastExtension());
const extensions::Extension* extension = LoadCastTestExtension();
@@ -283,9 +283,8 @@ IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastChromeOSTest,
IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastChromeOSTest, CastTrayOpenOptions) {
const extensions::Extension* extension = LoadCastTestExtension();
- ash::CastConfigDelegate* cast_config_delegate = ash::Shell::GetInstance()
- ->system_tray_delegate()
- ->GetCastConfigDelegate();
+ ash::CastConfigDelegate* cast_config_delegate =
+ ash::WmShell::Get()->system_tray_delegate()->GetCastConfigDelegate();
cast_config_delegate->LaunchCastOptions();
const GURL url =

Powered by Google App Engine
This is Rietveld 408576698