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 451618134703c828aa62f57f91cf8fb58a5cbe6b..0d84b5acb5ca6d9fa829b62dceded4a59e84fb23 100644 |
--- a/content/browser/web_contents/web_contents_view_aura.h |
+++ b/content/browser/web_contents/web_contents_view_aura.h |
@@ -24,6 +24,7 @@ class Window; |
namespace ui { |
class DropTargetEvent; |
+class TouchSelectionController; |
} |
namespace content { |
@@ -32,7 +33,7 @@ class OverscrollNavigationOverlay; |
class RenderWidgetHostImpl; |
class RenderWidgetHostViewAura; |
class ShadowLayerDelegate; |
-class TouchEditableImplAura; |
+class TouchSelectionControllerClientAura; |
class WebContentsViewDelegate; |
class WebContentsImpl; |
class WebDragDestDelegate; |
@@ -48,9 +49,6 @@ class WebContentsViewAura |
WebContentsViewAura(WebContentsImpl* web_contents, |
WebContentsViewDelegate* delegate); |
- CONTENT_EXPORT void SetTouchEditableForTest( |
- TouchEditableImplAura* touch_editable); |
- |
private: |
class WindowObserver; |
@@ -71,10 +69,11 @@ class WebContentsViewAura |
// animates in, or the content window animates out). |
void CompleteOverscrollNavigation(OverscrollMode mode); |
- void AttachTouchEditableToRenderView(); |
- |
void OverscrollUpdateForWebContentsDelegate(float delta_y); |
+ ui::TouchSelectionController* GetSelectionController() const; |
+ TouchSelectionControllerClientAura* GetSelectionControllerClient() const; |
+ |
// Overridden from WebContentsView: |
gfx::NativeView GetNativeView() const override; |
gfx::NativeView GetContentNativeView() const override; |
@@ -194,7 +193,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 |