Move OverscrollController to RenderWidgetHostViewAura

content/browser/renderer_host/render_widget_host_view_aura.h

Index: content/browser/renderer_host/render_widget_host_view_aura.h
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
index e5183f9d004e7e65c3c9219915f38f8b876514f9..2fb7ddf682157abc822565c0b73d3ce2a9df8e8f 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -69,6 +69,7 @@ namespace content {
 class LegacyRenderWidgetHostHWND;
 #endif
 
+class OverscrollController;
 class RenderFrameHostImpl;
 class RenderWidgetHostImpl;
 class RenderWidgetHostView;
@@ -205,6 +206,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
   virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE;
   virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
+  virtual void WheelEventAck(const blink::WebMouseWheelEvent& event,
+                             InputEventAckState ack_result) OVERRIDE;
   virtual void GestureEventAck(const blink::WebGestureEvent& event,
                                InputEventAckState ack_result) OVERRIDE;
   virtual void ProcessAckedTouchEvent(
@@ -214,6 +217,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
       OVERRIDE;
   virtual void SetScrollOffsetPinning(
       bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
+  virtual InputEventAckState FilterInputEvent(
+      const blink::WebInputEvent& input_event) OVERRIDE;
   virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
   virtual void CreateBrowserAccessibilityManagerIfNeeded() OVERRIDE;
   virtual bool LockMouse() OVERRIDE;
@@ -327,6 +332,13 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   // as part of RenderWidgetHostView.
   bool IsClosing() const { return in_shutdown_; }
 
+  // Sets whether the overscroll controller should be enabled for this page.
+  void SetOverscrollControllerEnabled(bool enabled);
+
+  OverscrollController* overscroll_controller() const {
+    return overscroll_controller_.get();
+  }
+
  protected:
   virtual ~RenderWidgetHostViewAura();
 
@@ -354,6 +366,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
                            DestroyedAfterCopyRequest);
   FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
                            VisibleViewportTest);
+  FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
+                           OverscrollResetsOnBlur);
 
   class WindowObserver;
   friend class WindowObserver;
@@ -549,6 +563,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
 
   TouchEditingClient* touch_editing_client_;
 
+  scoped_ptr<OverscrollController> overscroll_controller_;
+
   gfx::Insets insets_;
 
   std::vector<ui::LatencyInfo> software_latency_info_;