Move OverscrollController to RenderWidgetHostViewAura

content/browser/renderer_host/overscroll_controller.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_OVERSCROLL_CONTROLLER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_OVERSCROLL_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
 namespace ui {
 struct LatencyInfo;
 }
 
 namespace content {
 
-class MockRenderWidgetHost;
+class RenderWidgetHostViewAuraOverscrollTest;
 class OverscrollControllerDelegate;
 
 // Indicates the direction that the scroll is heading in relative to the screen,
 // with the top being NORTH.
 enum OverscrollMode {
   OVERSCROLL_NONE,
   OVERSCROLL_NORTH,
   OVERSCROLL_SOUTH,
   OVERSCROLL_WEST,
   OVERSCROLL_EAST,
@@ skipping 12 matching lines @@
   // The result of |DispatchEvent()|, indicating either how the event was
   // handled, or how it should be handled by the caller.
   enum Disposition {
     CONSUMED,
     SHOULD_FORWARD_TO_RENDERER,
     SHOULD_FORWARD_TO_GESTURE_QUEUE
   };
   // This must be called when dispatching any event from the
   // RenderWidgetHostView so that the state of the overscroll gesture can be
   // updated properly.
-  Disposition DispatchEvent(const blink::WebInputEvent& event,
-                            const ui::LatencyInfo& latency_info);
+  Disposition DispatchEvent(const blink::WebInputEvent& event);
 
   // This must be called when the ACK for any event comes in. This updates the
   // overscroll gesture status as appropriate.
   void ReceivedEventACK(const blink::WebInputEvent& event, bool processed);
 
   // This must be called when a gesture event is filtered out and not sent to
   // the renderer.
   void DiscardingGestureEvent(const blink::WebGestureEvent& event);
 
   OverscrollMode overscroll_mode() const { return overscroll_mode_; }
 
   void set_delegate(OverscrollControllerDelegate* delegate) {
     delegate_ = delegate;
   }
 
   // Resets internal states.
   void Reset();
 
   // Cancels any in-progress overscroll (and calls OnOverscrollModeChange on the
   // delegate if necessary), and resets internal states.
   void Cancel();
 
  private:
-  friend class MockRenderWidgetHost;
+  friend class RenderWidgetHostViewAuraOverscrollTest;
 
   // Different scrolling states.
   enum ScrollState {
     STATE_UNKNOWN,
     STATE_PENDING,
     STATE_CONTENT_SCROLLING,
     STATE_OVERSCROLLING,
   };
 
   // Returns true if the event indicates that the in-progress overscroll gesture
@@ skipping 41 matching lines @@
   // The delegate that receives the overscroll updates. The delegate is not
   // owned by this controller.
   OverscrollControllerDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(OverscrollController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_OVERSCROLL_CONTROLLER_H_