diff options
Diffstat (limited to 'ash/wm')
-rw-r--r-- | ash/wm/workspace/workspace_layout_manager_unittest.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc index b7e663f6..7bbd685 100644 --- a/ash/wm/workspace/workspace_layout_manager_unittest.cc +++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc @@ -769,14 +769,17 @@ TEST_F(WorkspaceLayoutManagerSoloTest, NotResizeWhenScreenIsLocked) { ScreenUtil::GetMaximizedWindowBoundsInParent(window.get()).ToString(), window_bounds.ToString()); + // The window size should not get touched while we are in lock screen. Shell::GetInstance()->session_state_delegate()->LockScreen(); shelf->UpdateVisibilityState(); - EXPECT_NE( - ScreenUtil::GetMaximizedWindowBoundsInParent(window.get()).ToString(), - window_bounds.ToString()); + EXPECT_EQ(window_bounds.ToString(), window->bounds().ToString()); + // Coming out of the lock screen the window size should still remain. Shell::GetInstance()->session_state_delegate()->UnlockScreen(); shelf->UpdateVisibilityState(); + EXPECT_EQ( + ScreenUtil::GetMaximizedWindowBoundsInParent(window.get()).ToString(), + window_bounds.ToString()); EXPECT_EQ(window_bounds.ToString(), window->bounds().ToString()); } |