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

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

Issue 698253004: Reland: Implement Aura side of unified touch text selection for contents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased after addition of touch_handle_orientation file Created 5 years, 10 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 999e535336eee05280ba1acb708d482ec677bc2c..e680900e07da9d586273cf90009e06b513a88dac 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 TouchSelectionControllerAura;
}
namespace content {
@@ -32,7 +33,6 @@ class OverscrollNavigationOverlay;
class RenderWidgetHostImpl;
class RenderWidgetHostViewAura;
class ShadowLayerDelegate;
-class TouchEditableImplAura;
class WebContentsViewDelegate;
class WebContentsImpl;
class WebDragDestDelegate;
@@ -49,9 +49,6 @@ class WebContentsViewAura
WebContentsViewAura(WebContentsImpl* web_contents,
WebContentsViewDelegate* delegate);
- CONTENT_EXPORT void SetTouchEditableForTest(
- TouchEditableImplAura* touch_editable);
-
private:
class WindowObserver;
@@ -98,10 +95,10 @@ class WebContentsViewAura
// overscroll (|delta_x|, in pixels).
void UpdateOverscrollWindowBrightness(float delta_x);
- void AttachTouchEditableToRenderView();
-
void OverscrollUpdateForWebContentsDelegate(float delta_y);
+ ui::TouchSelectionControllerAura* GetSelectionController();
+
// Overridden from WebContentsView:
gfx::NativeView GetNativeView() const override;
gfx::NativeView GetContentNativeView() const override;
@@ -231,7 +228,6 @@ class WebContentsViewAura
scoped_ptr<ShadowLayerDelegate> overscroll_shadow_;
- 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