Remove ObserveWheelEventAndResult callbacks since they are now gesture based.

ui/events/blink/input_scroll_elasticity_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/blink/input_scroll_elasticity_controller.h"
 
 #include <math.h>
 
 #include <algorithm>
 
@@ skipping 88 matching lines @@
 InputScrollElasticityController::~InputScrollElasticityController() {
 }
 
 base::WeakPtr<InputScrollElasticityController>
 InputScrollElasticityController::GetWeakPtr() {
   if (helper_)
     return weak_factory_.GetWeakPtr();
   return base::WeakPtr<InputScrollElasticityController>();
 }
 
-void InputScrollElasticityController::ObserveWheelEventAndResult(
-    const blink::WebMouseWheelEvent& wheel_event,
-    const cc::InputHandlerScrollResult& scroll_result) {
-  // We should only get PhaseMayBegin or PhaseBegan events while in the
-  // Inactive or MomentumAnimated states, but in case we get bad input (e.g,
-  // abbreviated by tab-switch), always re-set the state to ActiveScrolling
-  // when those events are received.
-  if (wheel_event.phase == blink::WebMouseWheelEvent::PhaseMayBegin ||
-      wheel_event.phase == blink::WebMouseWheelEvent::PhaseBegan) {
-    scroll_velocity = gfx::Vector2dF();
-    last_scroll_event_timestamp_ = base::TimeTicks();
-    state_ = kStateActiveScroll;
-    pending_overscroll_delta_ = gfx::Vector2dF();
-    return;
-  }
-
-  gfx::Vector2dF event_delta(-wheel_event.deltaX, -wheel_event.deltaY);
-  base::TimeTicks event_timestamp =
-      base::TimeTicks() +
-      base::TimeDelta::FromSecondsD(wheel_event.timeStampSeconds);
-  switch (state_) {
-    case kStateInactive: {
-      // The PhaseMayBegin and PhaseBegan cases are handled at the top of the
-      // function.
-      if (wheel_event.momentumPhase == blink::WebMouseWheelEvent::PhaseBegan)
-        state_ = kStateMomentumScroll;
-      break;
-    }
-    case kStateActiveScroll:
-      if (wheel_event.phase == blink::WebMouseWheelEvent::PhaseChanged) {
-        UpdateVelocity(event_delta, event_timestamp);
-        Overscroll(event_delta, scroll_result.unused_scroll_delta);
-      } else if (wheel_event.phase == blink::WebMouseWheelEvent::PhaseEnded ||
-                 wheel_event.phase ==
-                     blink::WebMouseWheelEvent::PhaseCancelled) {
-        if (helper_->StretchAmount().IsZero()) {
-          EnterStateInactive();
-        } else {
-          EnterStateMomentumAnimated(event_timestamp);
-        }
-      }
-      break;
-    case kStateMomentumScroll:
-      if (wheel_event.momentumPhase ==
-          blink::WebMouseWheelEvent::PhaseChanged) {
-        UpdateVelocity(event_delta, event_timestamp);
-        Overscroll(event_delta, scroll_result.unused_scroll_delta);
-        if (!helper_->StretchAmount().IsZero()) {
-          EnterStateMomentumAnimated(event_timestamp);
-        }
-      } else if (wheel_event.momentumPhase ==
-                 blink::WebMouseWheelEvent::PhaseEnded) {
-        EnterStateInactive();
-      }
-    case kStateMomentumAnimated:
-      // The PhaseMayBegin and PhaseBegan cases are handled at the top of the
-      // function.
-      break;
-  }
-}
-
 void InputScrollElasticityController::ObserveGestureEventAndResult(
     const blink::WebGestureEvent& gesture_event,
     const cc::InputHandlerScrollResult& scroll_result) {
   base::TimeTicks event_timestamp =
       base::TimeTicks() +
       base::TimeDelta::FromSecondsD(gesture_event.timeStampSeconds);
 
   switch (gesture_event.type) {
     case blink::WebInputEvent::GestureScrollBegin: {
       if (gesture_event.data.scrollBegin.synthetic)
@@ skipping 298 matching lines @@
       break;
     default:
       // These cases should not be hit because the stretch must be zero in the
       // Inactive and MomentumScroll states.
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace ui