| Index: ash/accelerators/accelerator_controller_unittest.cc
|
| diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
|
| index 31ebf9b4e41372d262315ef9e27db36153c2af10..4a94aabd90b29d8bca07641afd409219cbdc2e67 100644
|
| --- a/ash/accelerators/accelerator_controller_unittest.cc
|
| +++ b/ash/accelerators/accelerator_controller_unittest.cc
|
| @@ -432,13 +432,13 @@ TEST_F(AcceleratorControllerTest, WindowSnap) {
|
| window_state->Activate();
|
|
|
| {
|
| - GetController()->PerformAction(WINDOW_SNAP_LEFT, dummy);
|
| + GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
|
| gfx::Rect expected_bounds = wm::GetDefaultLeftSnappedWindowBoundsInParent(
|
| window.get());
|
| EXPECT_EQ(expected_bounds.ToString(), window->bounds().ToString());
|
| }
|
| {
|
| - GetController()->PerformAction(WINDOW_SNAP_RIGHT, dummy);
|
| + GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_RIGHT, dummy);
|
| gfx::Rect expected_bounds = wm::GetDefaultRightSnappedWindowBoundsInParent(
|
| window.get());
|
| EXPECT_EQ(expected_bounds.ToString(), window->bounds().ToString());
|
| @@ -457,11 +457,11 @@ TEST_F(AcceleratorControllerTest, WindowSnap) {
|
| EXPECT_EQ(normal_bounds.ToString(), window->bounds().ToString());
|
|
|
| GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
|
| - GetController()->PerformAction(WINDOW_SNAP_LEFT, dummy);
|
| + GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_LEFT, dummy);
|
| EXPECT_FALSE(window_state->IsMaximized());
|
|
|
| GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
|
| - GetController()->PerformAction(WINDOW_SNAP_RIGHT, dummy);
|
| + GetController()->PerformAction(WINDOW_SNAP_OR_DOCK_RIGHT, dummy);
|
| EXPECT_FALSE(window_state->IsMaximized());
|
|
|
| GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
|
|
|