diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 03:16:06 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 03:16:06 +0000 |
| commit | aa3c808b4db558cb88ba136bcd75947a390c7985 (patch) | |
| tree | 63a60d105f104cfe671ab97a151379be92072289 /ash/wm | |
| parent | a688c89c25dd5c966b112cd5dd8ef084698d363e (diff) | |
| download | chromium_src-aa3c808b4db558cb88ba136bcd75947a390c7985.zip chromium_src-aa3c808b4db558cb88ba136bcd75947a390c7985.tar.gz chromium_src-aa3c808b4db558cb88ba136bcd75947a390c7985.tar.bz2 | |
Side launcher animations, unit tests.
BUG=187495, 229960, 229963, 150772
Review URL: https://chromiumcodereview.appspot.com/14671005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201203 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/workspace/workspace_manager_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/wm/workspace/workspace_manager_unittest.cc b/ash/wm/workspace/workspace_manager_unittest.cc index a5e9796..01ad2cb 100644 --- a/ash/wm/workspace/workspace_manager_unittest.cc +++ b/ash/wm/workspace/workspace_manager_unittest.cc @@ -1138,12 +1138,12 @@ TEST_F(WorkspaceManagerTest, MoveOnSwitch) { w2->Show(); wm::ActivateWindow(w2.get()); - // Increase the size of the shelf. This would make |w1| fall completely out of - // the display work area. - gfx::Size size(shelf_widget()->status_area_widget()-> - GetWindowBoundsInScreen().size()); - size.Enlarge(0, 30); - shelf_widget()->status_area_widget()->SetSize(size); + // Increase the size of the WorkAreaInsets. This would make |w1| fall + // completely out of the display work area. + gfx::Insets insets = + Shell::GetScreen()->GetPrimaryDisplay().GetWorkAreaInsets(); + insets.Set(0, 0, insets.bottom() + 30, 0); + Shell::GetInstance()->SetDisplayWorkAreaInsets(w1.get(), insets); // Switch to w1. The window should have moved. wm::ActivateWindow(w1.get()); |