Reland: Implement Aura side of unified touch text selection for contents

content/browser/web_contents/web_contents_view_aura.cc

Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 5d46e43bdb1ac325f1f26800fca13868362da335..5ff03daa12ddf3c69a79824b944db11309cfc7ca 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -21,7 +21,7 @@
 #include "content/browser/renderer_host/web_input_event_aura.h"
 #include "content/browser/web_contents/aura/gesture_nav_simple.h"
 #include "content/browser/web_contents/aura/overscroll_navigation_overlay.h"
-#include "content/browser/web_contents/touch_editable_impl_aura.h"
+#include "content/browser/web_contents/aura/touch_selection_controller_client_aura.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_observer.h"
@@ -63,6 +63,7 @@
 #include "ui/gfx/image/image_png_rep.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
+#include "ui/touch_selection/touch_selection_controller.h"
 #include "ui/wm/public/drag_drop_client.h"
 #include "ui/wm/public/drag_drop_delegate.h"
 
@@ -531,8 +532,12 @@ class WebContentsViewAura::WindowObserver
                              const gfx::Rect& new_bounds) override {
     if (window == host_window_ || window == view_->window_) {
       SendScreenRects();
-      if (view_->touch_editable_)
-        view_->touch_editable_->UpdateEditingController();
+      if (old_bounds.origin() != new_bounds.origin()) {
+        ui::TouchSelectionController* selection_controller =
+            view_->GetSelectionController();
+        if (selection_controller)
+          selection_controller->OnNativeViewMoved();
+      }
 #if defined(OS_WIN)
     } else {
       UpdateConstrainedWindows(NULL);
@@ -650,7 +655,6 @@ WebContentsViewAura::WebContentsViewAura(WebContentsImpl* web_contents,
       current_overscroll_gesture_(OVERSCROLL_NONE),
       completed_overscroll_gesture_(OVERSCROLL_NONE),
       navigation_overlay_(nullptr),
-      touch_editable_(TouchEditableImplAura::Create()),
       is_or_was_visible_(false) {
 }
 
@@ -669,12 +673,6 @@ WebContentsViewAura::~WebContentsViewAura() {
   window_.reset();
 }
 
-void WebContentsViewAura::SetTouchEditableForTest(
-    TouchEditableImplAura* touch_editable) {
-  touch_editable_.reset(touch_editable);
-  AttachTouchEditableToRenderView();
-}
-
 void WebContentsViewAura::SizeChangedCommon(const gfx::Size& size) {
   if (web_contents_->GetInterstitialPage())
     web_contents_->GetInterstitialPage()->SetSize(size);
@@ -724,16 +722,9 @@ void WebContentsViewAura::CompleteOverscrollNavigation(OverscrollMode mode) {
   if (!web_contents_->GetRenderWidgetHostView())
     return;
   navigation_overlay_->relay_delegate()->OnOverscrollComplete(mode);
-  if (touch_editable_)
-    touch_editable_->OverscrollCompleted();
-}
-
-void WebContentsViewAura::AttachTouchEditableToRenderView() {
-  if (!touch_editable_)
-    return;
-  RenderWidgetHostViewAura* rwhva = ToRenderWidgetHostViewAura(
-      web_contents_->GetRenderWidgetHostView());
-  touch_editable_->AttachToView(rwhva);
+  ui::TouchSelectionController* selection_controller = GetSelectionController();
+  if (selection_controller)
+    selection_controller->HideAndDisallowShowingAutomatically();
 }
 
 void WebContentsViewAura::OverscrollUpdateForWebContentsDelegate(
@@ -742,6 +733,12 @@ void WebContentsViewAura::OverscrollUpdateForWebContentsDelegate(
     web_contents_->GetDelegate()->OverscrollUpdate(delta_y);
 }
 
+ui::TouchSelectionController* WebContentsViewAura::GetSelectionController() {
+  RenderWidgetHostViewAura* view =
+      ToRenderWidgetHostViewAura(web_contents_->GetRenderWidgetHostView());
+  return view ? view->selection_controller() : nullptr;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, WebContentsView implementation:
 
@@ -881,6 +878,10 @@ RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForWidget(
 
   RenderWidgetHostViewAura* view =
       new RenderWidgetHostViewAura(render_widget_host, is_guest_view_hack);
+  scoped_ptr<TouchSelectionControllerClientAura> selection_controller_client(
+      new TouchSelectionControllerClientAura(view));
+  view->InitSelectionController(selection_controller_client.Pass());
+
   view->InitAsChild(NULL);
   GetNativeView()->AddChild(view->GetNativeView());
 
@@ -899,7 +900,6 @@ RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForWidget(
     InstallOverscrollControllerDelegate(view);
   }
 
-  AttachTouchEditableToRenderView();
   return view;
 }
 
@@ -916,7 +916,6 @@ void WebContentsViewAura::RenderViewCreated(RenderViewHost* host) {
 }
 
 void WebContentsViewAura::RenderViewSwappedIn(RenderViewHost* host) {
-  AttachTouchEditableToRenderView();
 }
 
 void WebContentsViewAura::SetOverscrollControllerEnabled(bool enabled) {
@@ -941,9 +940,9 @@ void WebContentsViewAura::SetOverscrollControllerEnabled(bool enabled) {
 
 void WebContentsViewAura::ShowContextMenu(RenderFrameHost* render_frame_host,
                                           const ContextMenuParams& params) {
-  if (touch_editable_) {
-    touch_editable_->EndTouchEditing(false);
-  }
+  ui::TouchSelectionController* selection_controller = GetSelectionController();
+  if (selection_controller)
+    selection_controller->HideAndDisallowShowingAutomatically();
   if (delegate_) {
     RenderWidgetHostViewAura* view = ToRenderWidgetHostViewAura(
         web_contents_->GetRenderWidgetHostView());
@@ -967,9 +966,9 @@ void WebContentsViewAura::StartDragging(
     return;
   }
 
-  if (touch_editable_)
-    touch_editable_->EndTouchEditing(false);
-
+  ui::TouchSelectionController* selection_controller = GetSelectionController();
+  if (selection_controller)
+    selection_controller->HideAndDisallowShowingAutomatically();
   ui::OSExchangeData::Provider* provider = ui::OSExchangeData::CreateProvider();
   PrepareDragData(drop_data, provider, web_contents_);
 
@@ -1081,13 +1080,6 @@ void WebContentsViewAura::OnOverscrollModeChange(OverscrollMode old_mode,
   if (old_mode == OVERSCROLL_NORTH || old_mode == OVERSCROLL_SOUTH)
     OverscrollUpdateForWebContentsDelegate(0);
 
-  if (touch_editable_) {
-    if (new_mode == OVERSCROLL_NONE)
-      touch_editable_->OverscrollCompleted();
-    else
-      touch_editable_->OverscrollStarted();
-  }
-
   current_overscroll_gesture_ = new_mode;
   navigation_overlay_->relay_delegate()->OnOverscrollModeChange(old_mode,
                                                                 new_mode);