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

content/browser/frame_host/interstitial_page_impl.cc

Index: content/browser/frame_host/interstitial_page_impl.cc
diff --git a/content/browser/frame_host/interstitial_page_impl.cc b/content/browser/frame_host/interstitial_page_impl.cc
index 2d20802c43b69f612930dd74fb3d86faddb536d4..0f7152e9d09165538d0db6428b01602e6534b51d 100644
--- a/content/browser/frame_host/interstitial_page_impl.cc
+++ b/content/browser/frame_host/interstitial_page_impl.cc
@@ -29,6 +29,7 @@
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "content/browser/renderer_host/text_input_manager.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/web_contents/web_contents_view.h"
@@ -937,4 +938,11 @@ void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() {
   interstitial_->OnNavigatingAwayOrTabClosing();
 }
 
+TextInputManager* InterstitialPageImpl::GetTextInputManager() {
+  if (GetWebContents())
+    return static_cast<WebContentsImpl*>(web_contents_)->GetTextInputManager();
+
+  return RenderWidgetHostDelegate::GetTextInputManager();

[Charlie Reis, 2016/05/18 20:46:03]

I think it's clearer to just return nullptr in this case.  (I'm not sure if we
would ever put a default implementation in the delegate class.)

[EhsanK, 2016/05/24 20:42:44]

Done.

+}
+
 }  // namespace content