Merge ~osomon/oxide:hide-insertion-handle-on-input into oxide:master

[Olivier Tilloy]

Hide the selection handle upon keyboard/mouse/OSK interaction.

This does something similar to TouchSelectionControllerClientAura::EnvPreTargetHandler.
Fixes: https://launchpad.net/bugs/1590776.

[Chris Coulson (chrisccoulson)]

This mostly looks ok, although I think I'd like to see the copy/pasted code implemented as a new function somewhere

review: Needs Fixing

2aa8a09... by Olivier Tilloy on 2016-06-15

Factor out common code into RenderWidgetHostView::OnUserInput().

[Olivier Tilloy (osomon)]

Updated. Does that look good?

[Chris Coulson (chrisccoulson)]

review: Approve

diff --git a/shared/browser/input/oxide_ime_bridge_impl.cc b/shared/browser/input/oxide_ime_bridge_impl.cc
index cd24cda..3fb8fcc 100644
--- a/shared/browser/input/oxide_ime_bridge_impl.cc
+++ b/shared/browser/input/oxide_ime_bridge_impl.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2015 Canonical Ltd.
+// Copyright (C) 2015-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -63,6 +63,8 @@ void ImeBridgeImpl::CommitText(const base::string16& text,
     return;
   }
 
+  rwhv_->OnUserInput();
+
   content::RenderWidgetHostImpl* rwhi =
       content::RenderWidgetHostImpl::From(rwhv_->GetRenderWidgetHost());
   SendFakeCompositionKeyEvent(rwhi, blink::WebInputEvent::RawKeyDown);
@@ -78,6 +80,8 @@ void ImeBridgeImpl::SetComposingText(
     return;
   }
 
+  rwhv_->OnUserInput();
+
   content::RenderWidgetHostImpl* rwhi =
       content::RenderWidgetHostImpl::From(rwhv_->GetRenderWidgetHost());
   SendFakeCompositionKeyEvent(rwhi, blink::WebInputEvent::RawKeyDown);
diff --git a/shared/browser/oxide_render_widget_host_view.cc b/shared/browser/oxide_render_widget_host_view.cc
index 711174e..efef1ca 100644
--- a/shared/browser/oxide_render_widget_host_view.cc
+++ b/shared/browser/oxide_render_widget_host_view.cc
@@ -568,6 +568,13 @@ void RenderWidgetHostView::OnGestureEvent(
   host_->ForwardGestureEvent(event);
 }
 
+void RenderWidgetHostView::OnUserInput() const {
+  if (selection_controller_->active_status() ==
+          ui::TouchSelectionController::INSERTION_ACTIVE) {
+    selection_controller_->HideAndDisallowShowingAutomatically();
+  }
+}
+
 bool RenderWidgetHostView::HandleContextMenu(
     const content::ContextMenuParams& params) {
   if ((params.source_type == ui::MENU_SOURCE_LONG_PRESS) &&
diff --git a/shared/browser/oxide_render_widget_host_view.h b/shared/browser/oxide_render_widget_host_view.h
index af620cc..7607dde 100644
--- a/shared/browser/oxide_render_widget_host_view.h
+++ b/shared/browser/oxide_render_widget_host_view.h
@@ -107,6 +107,8 @@ class RenderWidgetHostView
     return selection_controller_.get();
   }
 
+  void OnUserInput() const;
+
   bool HandleContextMenu(const content::ContextMenuParams& params);
 
  private:
diff --git a/shared/browser/oxide_web_contents_view.cc b/shared/browser/oxide_web_contents_view.cc
index 6094b8e..0828883 100644
--- a/shared/browser/oxide_web_contents_view.cc
+++ b/shared/browser/oxide_web_contents_view.cc
@@ -830,6 +830,8 @@ void WebContentsView::HandleKeyEvent(
     return;
   }
 
+  GetRenderWidgetHostView()->OnUserInput();
+
   host->ForwardKeyboardEvent(event);
 }
 
@@ -843,6 +845,8 @@ void WebContentsView::HandleMouseEvent(const blink::WebMouseEvent& event) {
     return;
   }
 
+  GetRenderWidgetHostView()->OnUserInput();
+
   host->ForwardMouseEvent(e);
 }
 
@@ -862,6 +866,8 @@ void WebContentsView::HandleWheelEvent(
     return;
   }
 
+  GetRenderWidgetHostView()->OnUserInput();
+
   host->ForwardWheelEvent(event);
 }