| Index: ash/wm/toplevel_window_event_handler.cc
|
| diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc
|
| index a0d4b5e7e0b5b589c205c54c0c06f537e04466e9..b7cfcc080664b5bfed785c4f38c44065a7e8222a 100644
|
| --- a/ash/wm/toplevel_window_event_handler.cc
|
| +++ b/ash/wm/toplevel_window_event_handler.cc
|
| @@ -301,7 +301,7 @@ void ToplevelWindowEventHandler::OnGestureEvent(ui::GestureEvent* event) {
|
| SetRestoreBoundsInParent(target, pre_drag_window_bounds_);
|
| wm::MaximizeWindow(target);
|
| }
|
| - } else if (wm::CanSnapWindow(target) &&
|
| + } else if (internal::SnapSizer::CanSnapWindow(target) &&
|
| fabs(event->details().velocity_x()) >
|
| kMinHorizVelocityForWindowSwipe) {
|
| // Snap left/right.
|
| @@ -309,9 +309,10 @@ void ToplevelWindowEventHandler::OnGestureEvent(ui::GestureEvent* event) {
|
| target->layer()->GetAnimator());
|
| scoped_setter.SetPreemptionStrategy(
|
| ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
|
| - internal::SnapSizer::SnapWindow(target,
|
| - event->details().velocity_x() < 0 ?
|
| - internal::SnapSizer::LEFT_EDGE : internal::SnapSizer::RIGHT_EDGE);
|
| + using internal::SnapSizer;
|
| + SnapSizer::Edge edge = event->details().velocity_x() < 0 ?
|
| + SnapSizer::LEFT_EDGE : SnapSizer::RIGHT_EDGE;
|
| + SnapSizer::SnapWindow(target, edge, SnapSizer::STEP_NO);
|
| }
|
| break;
|
| }
|
|
|