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

Unified Diff: ash/root_window_controller_unittest.cc

Issue 2573703003: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: rebase on session change, fix tests Created 4 years 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/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 43fd9ee96253bcc58ce340e19cc51ee898819ff1..94d56b2539d917f51db199cdf41950a8298654d8 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -976,7 +976,7 @@ TEST_F(VirtualKeyboardRootWindowControllerTest,
aura::WindowTracker tracker;
tracker.Add(keyboard_container);
// Mock a login user profile change to reinitialize the keyboard.
- Shell::GetInstance()->OnLoginUserProfilePrepared();
+ WmShell::Get()->OnUserSessionStateActive();
msw 2016/12/16 16:26:20 This is okay, but it'd be even better if we could
James Cook 2016/12/20 04:02:43 Done.
// keyboard_container should no longer be present.
EXPECT_FALSE(tracker.Contains(keyboard_container));
}
@@ -1010,7 +1010,7 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, RestoreWorkspaceAfterLogin) {
}
// Mock a login user profile change to reinitialize the keyboard.
- Shell::GetInstance()->OnLoginUserProfilePrepared();
+ WmShell::Get()->OnUserSessionStateActive();
EXPECT_EQ(display::Screen::GetScreen()->GetPrimaryDisplay().work_area(),
before);
}

Powered by Google App Engine
This is Rietveld 408576698