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

Unified Diff: ash/root_window_controller_unittest.cc

Issue 1116313002: Layout login/lock screen, shelf and app list inside the first display in Unified Desktop mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/screen_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 8807851def2b3c7f7b55e9cc2c7bda4abbd3950b..27ae0e015dcd9693179cda5655aeb82364e6b14f 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -335,8 +335,7 @@ TEST_F(RootWindowControllerTest, MoveWindows_LockWindowsInUnified) {
controller->GetRootWindow()->GetChildById(kLockScreenWindowId));
ASSERT_EQ(lock_background->GetNativeWindow(),
controller->GetRootWindow()->GetChildById(kLockBackgroundWindowId));
- EXPECT_EQ("0,0 1000x500",
- lock_screen->GetNativeWindow()->bounds().ToString());
+ EXPECT_EQ("0,0 500x500", lock_screen->GetNativeWindow()->bounds().ToString());
// Switch to mirror.
display_manager->SetMirrorMode(true);
@@ -359,8 +358,7 @@ TEST_F(RootWindowControllerTest, MoveWindows_LockWindowsInUnified) {
controller->GetRootWindow()->GetChildById(kLockScreenWindowId));
ASSERT_EQ(lock_background->GetNativeWindow(),
controller->GetRootWindow()->GetChildById(kLockBackgroundWindowId));
- EXPECT_EQ("0,0 1000x500",
- lock_screen->GetNativeWindow()->bounds().ToString());
+ EXPECT_EQ("0,0 500x500", lock_screen->GetNativeWindow()->bounds().ToString());
// Switch to single display.
UpdateDisplay("600x500");
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/screen_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698