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

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.h

Issue 1046783002: wip: Aura-specific implementation of unified touch selection: touch_selection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moving the responsibility for showing the menu into the client. Created 5 years, 8 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
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 296c78547454d5f56073abfa94bcfdddcd03dc46..e517a4aea469c91c6da000a47c0c22ba3632a84a 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -32,7 +32,7 @@
#include "ui/events/gesture_detection/filtered_gesture_provider.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/geometry/vector2d_f.h"
-#include "ui/touch_selection/touch_selection_controller.h"
+#include "ui/touch_selection/touch_selection_controller_android.h"
struct ViewHostMsg_TextInputState_Params;
@@ -91,7 +91,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
public ui::WindowAndroidObserver,
public DelegatedFrameEvictorClient,
public StylusTextSelectorClient,
- public ui::TouchSelectionControllerClient {
+ public ui::TouchSelectionControllerAndroidClient {
public:
RenderWidgetHostViewAndroid(RenderWidgetHostImpl* widget,
ContentViewCoreImpl* content_view_core);
@@ -213,7 +213,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
void OnStylusSelectEnd() override;
void OnStylusSelectTap(base::TimeTicks time, float x, float y) override;
- // ui::TouchSelectionControllerClient implementation.
+ // ui::TouchSelectionControllerAndroidClient implementation.
bool SupportsAnimation() const override;
void SetNeedsAnimate() override;
void MoveCaret(const gfx::PointF& position) override;
@@ -400,7 +400,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
// Manages selection handle rendering and manipulation.
// This will always be NULL if |content_view_core_| is NULL.
- scoped_ptr<ui::TouchSelectionController> selection_controller_;
+ scoped_ptr<ui::TouchSelectionControllerAndroid> selection_controller_;
int accelerated_surface_route_id_;
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698