| Index: ash/wm/gestures/overview_gesture_handler.cc
|
| diff --git a/ash/wm/gestures/overview_gesture_handler.cc b/ash/wm/gestures/overview_gesture_handler.cc
|
| index 1ed1484d2fe184f32ba505e639ebc48e275d850d..2b94b9eefe3bc64cc952241ac2f3a8434de651a7 100644
|
| --- a/ash/wm/gestures/overview_gesture_handler.cc
|
| +++ b/ash/wm/gestures/overview_gesture_handler.cc
|
| @@ -20,13 +20,11 @@ const float kSwipeThresholdPixels = 300;
|
|
|
| OverviewGestureHandler::OverviewGestureHandler() : scroll_x_(0), scroll_y_(0) {}
|
|
|
| -OverviewGestureHandler::~OverviewGestureHandler() {
|
| -}
|
| +OverviewGestureHandler::~OverviewGestureHandler() {}
|
|
|
| bool OverviewGestureHandler::ProcessScrollEvent(const ui::ScrollEvent& event) {
|
| if (event.type() == ui::ET_SCROLL_FLING_START ||
|
| - event.type() == ui::ET_SCROLL_FLING_CANCEL ||
|
| - event.finger_count() != 3) {
|
| + event.type() == ui::ET_SCROLL_FLING_CANCEL || event.finger_count() != 3) {
|
| scroll_x_ = scroll_y_ = 0;
|
| return false;
|
| }
|
|
|