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

Unified Diff: ash/wm/maximize_mode/maximize_mode_controller_unittest.cc

Issue 2084503007: Moves WindowSelectorController onto WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_overview
Patch Set: fix mash 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/wm/maximize_mode/maximize_mode_controller_unittest.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
index bf168ad82555b327660b3494bbb0ce9aefcafc53..aa48572170cfba9778bcfcb1a6c2519ba620cf4e 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
+++ b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
@@ -11,6 +11,7 @@
#include "ash/common/ash_switches.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/wm/overview/window_selector_controller.h"
+#include "ash/common/wm_shell.h"
#include "ash/display/display_manager.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
@@ -476,11 +477,10 @@ TEST_F(MaximizeModeControllerTest, DisplayDisconnectionDuringOverview) {
ASSERT_NE(w1->GetRootWindow(), w2->GetRootWindow());
maximize_mode_controller()->EnableMaximizeModeWindowManager(true);
- Shell::GetInstance()->window_selector_controller()->ToggleOverview();
+ WmShell::Get()->window_selector_controller()->ToggleOverview();
UpdateDisplay("800x600");
- EXPECT_FALSE(
- Shell::GetInstance()->window_selector_controller()->IsSelecting());
+ EXPECT_FALSE(WmShell::Get()->window_selector_controller()->IsSelecting());
EXPECT_EQ(w1->GetRootWindow(), w2->GetRootWindow());
}
« no previous file with comments | « ash/wm/gestures/overview_gesture_handler_unittest.cc ('k') | ash/wm/maximize_mode/maximize_mode_window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698