Remove is_fling flag for fling intervention

blimp/client/core/input/blimp_input_handler_wrapper.cc

 // Copyright 2015 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 "blimp/client/core/input/blimp_input_handler_wrapper.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 53 matching lines @@
 
   switch (disposition) {
     case ui::InputHandlerProxy::EventDisposition::DID_HANDLE:
     case ui::InputHandlerProxy::EventDisposition::DROP_EVENT:
       consumed = true;
       break;
     case ui::InputHandlerProxy::EventDisposition::DID_HANDLE_NON_BLOCKING:
     case ui::InputHandlerProxy::EventDisposition::DID_NOT_HANDLE:
       consumed = false;
       break;
+    case ui::InputHandlerProxy::EventDisposition::
+        DID_NOT_HANDLE_NON_BLOCKING_DUE_TO_FLING:
+      NOTREACHED();
+      break;
   }
 
   main_task_runner_->PostTask(
       FROM_HERE, base::Bind(&BlimpInputManager::DidHandleWebGestureEvent,
                             input_manager_weak_ptr_, gesture_event, consumed));
 }
 
 void BlimpInputHandlerWrapper::WillShutdown() {
   DCHECK(compositor_thread_checker_.CalledOnValidThread());
 
@@ skipping 33 matching lines @@
 }
 
 void BlimpInputHandlerWrapper::DidOverscroll(
     const gfx::Vector2dF& accumulated_overscroll,
     const gfx::Vector2dF& latest_overscroll_delta,
     const gfx::Vector2dF& current_fling_velocity,
     const gfx::PointF& causal_event_viewport_point) {
   DCHECK(compositor_thread_checker_.CalledOnValidThread());
 }
 
-void BlimpInputHandlerWrapper::DidStartFlinging() {
-  DCHECK(compositor_thread_checker_.CalledOnValidThread());
-}
-
 void BlimpInputHandlerWrapper::DidStopFlinging() {
   DCHECK(compositor_thread_checker_.CalledOnValidThread());
 }
 
 void BlimpInputHandlerWrapper::DidAnimateForInput() {
   DCHECK(compositor_thread_checker_.CalledOnValidThread());
 }
 
 void BlimpInputHandlerWrapper::InitOnCompositorThread(
     cc::InputHandler* input_handler) {
   DCHECK(compositor_thread_checker_.CalledOnValidThread());
 
   input_handler_proxy_ =
       base::MakeUnique<ui::InputHandlerProxy>(input_handler, this);
   main_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&BlimpInputManager::OnInputHandlerWrapperInitialized,
                  input_manager_weak_ptr_, weak_factory_.GetWeakPtr()));
 }
 
 }  // namespace client
 }  // namespace blimp