wip: Aura-specific implementation of unified touch selection: touch_selection

content/browser/renderer_host/render_widget_host_view_android.h

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 e1cf270d43dff9e83bd08433d673feb78fc76576..f2015affabc8f66473a09b60049c62aa2d2cf6ee 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);
@@ -210,7 +210,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;
@@ -395,7 +395,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_;