diff options
| author | skuhne <skuhne@chromium.org> | 2014-12-04 15:53:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-04 23:53:48 +0000 |
| commit | 93b0ead35c2272f91ec1b7baeb930b2ee8ca7002 (patch) | |
| tree | b4a46357413fde7bcfc3da8da528353d66e820a3 /ash/wm | |
| parent | c291fa67fd914739347a72369ee8d1029b95c645 (diff) | |
| download | chromium_src-93b0ead35c2272f91ec1b7baeb930b2ee8ca7002.zip chromium_src-93b0ead35c2272f91ec1b7baeb930b2ee8ca7002.tar.gz chromium_src-93b0ead35c2272f91ec1b7baeb930b2ee8ca7002.tar.bz2 | |
Fixing orientation problem of the shelf when entering / exiting add user screen
BUG=436970
TEST=ShelfLayoutManagerTest.SideAlignmentInteractionWithAddUserScreen & visual
Review URL: https://codereview.chromium.org/751343004
Cr-Commit-Position: refs/heads/master@{#306935}
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()); } |