[reland] Browser Side Text Input State Tracking for OOPIF (Aura Only)

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 45028e9c00cf69c8da56ce10e1d82ec9e5a6004a..3fd2caa614d14396def06a1d09f188ac7502d9c7 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -65,6 +65,7 @@
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "content/browser/renderer_host/text_input_manager.h"
 #include "content/browser/screen_orientation/screen_orientation_dispatcher_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/wake_lock/wake_lock_service_context.h"
@@ -2363,6 +2364,25 @@ void WebContentsImpl::SendScreenRects() {
     browser_plugin_embedder_->DidSendScreenRects();
 }
 
+TextInputManager* WebContentsImpl::GetTextInputManager() {
+  if (GetOuterWebContents()) {
+    if (text_input_manager_) {
+      // Since the outer WebContents exists, we should destroy
+      // |text_input_manager_| which will in turn notify all the
+      // RenderWidgetHostViews.
+      // TODO(ekaramad): Is this the right way to for IME handoff?
+      // (crbug.com/609846).
+      text_input_manager_.reset(nullptr);
+    }
+    return GetOuterWebContents()->GetTextInputManager();
+  }
+
+  if (!text_input_manager_)
+    text_input_manager_.reset(new TextInputManager());
+
+  return text_input_manager_.get();
+}
+
 BrowserAccessibilityManager*
     WebContentsImpl::GetRootBrowserAccessibilityManager() {
   RenderFrameHostImpl* rfh = GetMainFrame();