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

Unified Diff: ash/content/display/screen_orientation_controller_chromeos_unittest.cc

Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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: ash/content/display/screen_orientation_controller_chromeos_unittest.cc
diff --git a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
index d8fb9064767d4a58697a047cd84e2f492a209481..b07a268c36a1429263b9ee9773e2fd52edcbefbd 100644
--- a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
+++ b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
@@ -8,6 +8,7 @@
#include <vector>
#include "ash/ash_switches.h"
+#include "ash/common/wm_shell.h"
#include "ash/content/shell_content_state.h"
#include "ash/display/display_info.h"
#include "ash/display/display_manager.h"
@@ -418,7 +419,7 @@ TEST_F(ScreenOrientationControllerTest, BlockRotationNotifications) {
EnableMaximizeMode(true);
test::TestSystemTrayDelegate* tray_delegate =
msw 2016/06/10 18:48:20 nit: use AshTestBase::GetSystemTrayDelegate
James Cook 2016/06/10 20:20:28 Done.
static_cast<test::TestSystemTrayDelegate*>(
- Shell::GetInstance()->system_tray_delegate());
+ WmShell::Get()->system_tray_delegate());
tray_delegate->set_should_show_display_notification(true);
test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/metrics/user_metrics_recorder.cc » ('j') | ash/shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698