summaryrefslogtreecommitdiffstats
path: root/ash/wm/gestures
diff options
context:
space:
mode:
Diffstat (limited to 'ash/wm/gestures')
-rw-r--r--ash/wm/gestures/system_pinch_handler.cc3
-rw-r--r--ash/wm/gestures/two_finger_drag_handler.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/ash/wm/gestures/system_pinch_handler.cc b/ash/wm/gestures/system_pinch_handler.cc
index 2f519b0..f34836c 100644
--- a/ash/wm/gestures/system_pinch_handler.cc
+++ b/ash/wm/gestures/system_pinch_handler.cc
@@ -95,7 +95,8 @@ SystemGestureStatus SystemPinchHandler::ProcessGestureEvent(
SnapSizer sizer(target_,
gfx::Point(),
event.details().swipe_left() ? internal::SnapSizer::LEFT_EDGE :
- internal::SnapSizer::RIGHT_EDGE);
+ internal::SnapSizer::RIGHT_EDGE,
+ internal::SnapSizer::OTHER_INPUT);
target_->SetBounds(sizer.GetSnapBounds(target_->bounds()));
} else if (event.details().swipe_up()) {
if (!wm::IsWindowMaximized(target_) &&
diff --git a/ash/wm/gestures/two_finger_drag_handler.cc b/ash/wm/gestures/two_finger_drag_handler.cc
index 7ed214a..a450a27 100644
--- a/ash/wm/gestures/two_finger_drag_handler.cc
+++ b/ash/wm/gestures/two_finger_drag_handler.cc
@@ -136,7 +136,8 @@ bool TwoFingerDragHandler::ProcessGestureEvent(aura::Window* target,
internal::SnapSizer sizer(target,
gfx::Point(),
event.details().swipe_left() ? internal::SnapSizer::LEFT_EDGE :
- internal::SnapSizer::RIGHT_EDGE);
+ internal::SnapSizer::RIGHT_EDGE,
+ internal::SnapSizer::OTHER_INPUT);
ui::ScopedLayerAnimationSettings scoped_setter(
target->layer()->GetAnimator());