Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Unified Diff: content/browser/web_contents/web_contents_view_aura.h

Issue 1263703004: Revert of Implement Aura side of unified touch text selection for contents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 0d84b5acb5ca6d9fa829b62dceded4a59e84fb23..451618134703c828aa62f57f91cf8fb58a5cbe6b 100644
--- a/content/browser/web_contents/web_contents_view_aura.h
+++ b/content/browser/web_contents/web_contents_view_aura.h
@@ -24,7 +24,6 @@
namespace ui {
class DropTargetEvent;
-class TouchSelectionController;
}
namespace content {
@@ -33,7 +32,7 @@
class RenderWidgetHostImpl;
class RenderWidgetHostViewAura;
class ShadowLayerDelegate;
-class TouchSelectionControllerClientAura;
+class TouchEditableImplAura;
class WebContentsViewDelegate;
class WebContentsImpl;
class WebDragDestDelegate;
@@ -49,6 +48,9 @@
WebContentsViewAura(WebContentsImpl* web_contents,
WebContentsViewDelegate* delegate);
+ CONTENT_EXPORT void SetTouchEditableForTest(
+ TouchEditableImplAura* touch_editable);
+
private:
class WindowObserver;
@@ -69,10 +71,9 @@
// 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;
@@ -193,6 +194,7 @@
// 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

Powered by Google App Engine
This is Rietveld 408576698