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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

Issue 2766543002: Move even more from WmShell to Shell (Closed)
Patch Set: Created 3 years, 9 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/multi_user/multi_user_window_manager_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
index 103ea8be87dd26f51557c49b0469b70788f31e1e..4e7c5cda88e7344eb4224278d968466726c1d79b 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -273,13 +273,13 @@ class MultiUserWindowManagerChromeOSTest : public AshTestBase {
// Create a maximize mode window manager.
MaximizeModeWindowManager* CreateMaximizeModeWindowManager() {
EXPECT_FALSE(maximize_mode_window_manager());
- WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+ Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
true);
return maximize_mode_window_manager();
}
MaximizeModeWindowManager* maximize_mode_window_manager() {
- return WmShell::Get()
+ return Shell::Get()
->maximize_mode_controller()
->maximize_mode_window_manager_.get();
}
@@ -1522,7 +1522,7 @@ TEST_F(MultiUserWindowManagerChromeOSTest, WindowsOrderPreservedTests) {
EXPECT_EQ(wm::GetActiveWindow(), window(0));
aura::Window::Windows mru_list = WmWindow::ToAuraWindows(
- WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
+ Shell::Get()->mru_window_tracker()->BuildMruWindowList());
EXPECT_EQ(mru_list[0], window(0));
EXPECT_EQ(mru_list[1], window(1));
EXPECT_EQ(mru_list[2], window(2));
@@ -1540,7 +1540,7 @@ TEST_F(MultiUserWindowManagerChromeOSTest, WindowsOrderPreservedTests) {
EXPECT_EQ(wm::GetActiveWindow(), window(0));
mru_list = WmWindow::ToAuraWindows(
- WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
+ Shell::Get()->mru_window_tracker()->BuildMruWindowList());
EXPECT_EQ(mru_list[0], window(0));
EXPECT_EQ(mru_list[1], window(1));
EXPECT_EQ(mru_list[2], window(2));

Powered by Google App Engine
This is Rietveld 408576698