Index: content/browser/renderer_host/render_widget_host_view_android.h |
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h |
index 48d6536e70aac1254e3bef5b8e4049a0ddcc5202..bb7bd628e9dde9a30aa46b4a146e92fbd3d28187 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_android.h |
+++ b/content/browser/renderer_host/render_widget_host_view_android.h |
@@ -49,7 +49,7 @@ class WebMouseEvent; |
namespace content { |
class ContentViewCoreImpl; |
-class OverscrollGlow; |
+class OverscrollControllerAndroid; |
class RenderWidgetHost; |
class RenderWidgetHostImpl; |
struct DidOverscrollParams; |
@@ -212,6 +212,16 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid |
virtual void SelectRange(float x1, float y1, float x2, float y2) override; |
virtual void LongPress(base::TimeTicks time, float x, float y) override; |
+ // TouchSelectionControllerClient implementation. |
+ virtual bool SupportsAnimation() const override; |
+ virtual void SetNeedsAnimate() override; |
+ virtual void MoveCaret(const gfx::PointF& position) override; |
+ virtual void SelectBetweenCoordinates(const gfx::PointF& start, |
+ const gfx::PointF& end) override; |
+ virtual void OnSelectionEvent(SelectionEventType event, |
+ const gfx::PointF& anchor_position) override; |
+ virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() override; |
+ |
// Non-virtual methods |
void SetContentViewCore(ContentViewCoreImpl* content_view_core); |
SkColor GetCachedBackgroundColor() const; |
@@ -265,16 +275,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid |
const TextSurroundingSelectionCallback& callback); |
private: |
- // TouchSelectionControllerClient implementation. |
- virtual bool SupportsAnimation() const override; |
- virtual void SetNeedsAnimate() override; |
- virtual void MoveCaret(const gfx::PointF& position) override; |
- virtual void SelectBetweenCoordinates(const gfx::PointF& start, |
- const gfx::PointF& end) override; |
- virtual void OnSelectionEvent(SelectionEventType event, |
- const gfx::PointF& anchor_position) override; |
- virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() override; |
- |
void RunAckCallbacks(); |
void DestroyDelegatedContent(); |
@@ -374,9 +374,9 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid |
std::queue<base::Closure> ack_callbacks_; |
- const bool overscroll_effect_enabled_; |
- // Used to render overscroll overlays. |
- scoped_ptr<OverscrollGlow> overscroll_effect_; |
+ // Used to control and render overscroll-related effects. |
+ const bool overscroll_controller_enabled_; |
+ scoped_ptr<OverscrollControllerAndroid> overscroll_controller_; |
// Provides gesture synthesis given a stream of touch events (derived from |
// Android MotionEvent's) and touch event acks. |