| Index: ash/wm/toplevel_window_event_handler_unittest.cc
|
| diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc
|
| index c84f8b3f122fceb1fbfb3738a84915d365a58616..cac12709684b09feb48672b7a12bc2007c7cbb0e 100644
|
| --- a/ash/wm/toplevel_window_event_handler_unittest.cc
|
| +++ b/ash/wm/toplevel_window_event_handler_unittest.cc
|
| @@ -392,8 +392,8 @@ TEST_F(ToplevelWindowEventHandlerTest, GestureDrag) {
|
| // Get the expected snapped bounds before snapping.
|
| internal::SnapSizer sizer(target.get(), location,
|
| internal::SnapSizer::RIGHT_EDGE,
|
| - internal::SnapSizer::OTHER_INPUT);
|
| - gfx::Rect snapped_bounds = sizer.GetSnapBounds(target->bounds());
|
| + internal::SnapSizer::STEP_NO);
|
| + gfx::Rect snapped_bounds = sizer.target_bounds();
|
|
|
| end.Offset(100, 0);
|
| generator.GestureScrollSequence(location, end,
|
| @@ -413,8 +413,8 @@ TEST_F(ToplevelWindowEventHandlerTest, GestureDrag) {
|
| // Get the expected snapped bounds before snapping.
|
| internal::SnapSizer sizer(target.get(), location,
|
| internal::SnapSizer::LEFT_EDGE,
|
| - internal::SnapSizer::OTHER_INPUT);
|
| - gfx::Rect snapped_bounds = sizer.GetSnapBounds(target->bounds());
|
| + internal::SnapSizer::STEP_NO);
|
| + gfx::Rect snapped_bounds = sizer.target_bounds();
|
| end = location = target->GetBoundsInRootWindow().CenterPoint();
|
| end.Offset(-100, 0);
|
| generator.GestureScrollSequence(location, end,
|
| @@ -532,8 +532,8 @@ TEST_F(ToplevelWindowEventHandlerTest, GestureDragForUnresizableWindow) {
|
| // Get the expected snapped bounds before the gesture.
|
| internal::SnapSizer sizer(target.get(), location,
|
| internal::SnapSizer::RIGHT_EDGE,
|
| - internal::SnapSizer::OTHER_INPUT);
|
| - gfx::Rect snapped_bounds = sizer.GetSnapBounds(target->bounds());
|
| + internal::SnapSizer::STEP_NO);
|
| + gfx::Rect snapped_bounds = sizer.target_bounds();
|
|
|
| end.Offset(100, 0);
|
| generator.GestureScrollSequence(location, end,
|
| @@ -557,8 +557,8 @@ TEST_F(ToplevelWindowEventHandlerTest, GestureDragForUnresizableWindow) {
|
| // Get the expected snapped bounds before the gesture.
|
| internal::SnapSizer sizer(target.get(), location,
|
| internal::SnapSizer::LEFT_EDGE,
|
| - internal::SnapSizer::OTHER_INPUT);
|
| - gfx::Rect snapped_bounds = sizer.GetSnapBounds(target->bounds());
|
| + internal::SnapSizer::STEP_NO);
|
| + gfx::Rect snapped_bounds = sizer.target_bounds();
|
| end = location = target->GetBoundsInRootWindow().CenterPoint();
|
| end.Offset(-100, 0);
|
| generator.GestureScrollSequence(location, end,
|
|
|