Index: content/browser/web_contents/web_contents_view_aura.h |
diff --git a/content/browser/web_contents/web_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h |
index f184fb226b2675ec72b36ca31832aecbbc3c6c9e..8b3e34175a793ff463aba37e7388be712857114a 100644 |
--- a/content/browser/web_contents/web_contents_view_aura.h |
+++ b/content/browser/web_contents/web_contents_view_aura.h |
@@ -23,6 +23,7 @@ class Window; |
namespace ui { |
class DropTargetEvent; |
+class TouchSelectionController; |
} |
namespace content { |
@@ -31,7 +32,6 @@ class OverscrollNavigationOverlay; |
class RenderWidgetHostImpl; |
class RenderWidgetHostViewAura; |
class ShadowLayerDelegate; |
-class TouchEditableImplAura; |
class WebContentsViewDelegate; |
class WebContentsImpl; |
class WebDragDestDelegate; |
@@ -47,9 +47,6 @@ class WebContentsViewAura |
WebContentsViewAura(WebContentsImpl* web_contents, |
WebContentsViewDelegate* delegate); |
- CONTENT_EXPORT void SetTouchEditableForTest( |
- TouchEditableImplAura* touch_editable); |
- |
private: |
class WindowObserver; |
@@ -70,10 +67,10 @@ class WebContentsViewAura |
// animates in, or the content window animates out). |
void CompleteOverscrollNavigation(OverscrollMode mode); |
- void AttachTouchEditableToRenderView(); |
- |
void OverscrollUpdateForWebContentsDelegate(float delta_y); |
+ ui::TouchSelectionController* GetSelectionController(); |
+ |
// Overridden from WebContentsView: |
gfx::NativeView GetNativeView() const override; |
gfx::NativeView GetContentNativeView() const override; |
@@ -192,7 +189,6 @@ class WebContentsViewAura |
// navigation triggered by the overscroll gesture. |
scoped_ptr<OverscrollNavigationOverlay> navigation_overlay_; |
- scoped_ptr<TouchEditableImplAura> touch_editable_; |
scoped_ptr<GestureNavSimple> gesture_nav_simple_; |
// On Windows we can run into problems if resources get released within the |