Add support for interstitial pages on android.

content/browser/web_contents/web_contents_view_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_view_android.h"
 
 #include "base/logging.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/media_player_manager_android.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/browser/web_contents/interstitial_page_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
-#include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/web_contents_delegate.h"
 
 namespace content {
 WebContentsView* CreateWebContentsView(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate,
     RenderViewHostDelegateView** render_view_host_delegate_view) {
   WebContentsViewAndroid* rv = new WebContentsViewAndroid(
       web_contents, delegate);
   *render_view_host_delegate_view = rv;
@@ skipping 11 matching lines @@
 WebContentsViewAndroid::~WebContentsViewAndroid() {
 }
 
 void WebContentsViewAndroid::SetContentViewCore(
     ContentViewCoreImpl* content_view_core) {
   content_view_core_ = content_view_core;
   RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
       web_contents_->GetRenderWidgetHostView());
   if (rwhv)
     rwhv->SetContentViewCore(content_view_core_);
+
   if (web_contents_->ShowingInterstitialPage()) {
-    NOTIMPLEMENTED() << "not upstreamed yet";
+    rwhv = static_cast<RenderWidgetHostViewAndroid*>(
+        static_cast<InterstitialPageImpl*>(
+            web_contents_->GetInterstitialPage())->
+                GetRenderViewHost()->GetView());
+    if (rwhv)
+      rwhv->SetContentViewCore(content_view_core_);

[Ted C, 2012/11/07 18:55:21]

I ended up needing to switch this back to the previous version as we want to set
the content view core on both renderwidgethostviews and not just one depending
on whether the interstitial was showing.

   }
 }
 
 void WebContentsViewAndroid::CreateView(const gfx::Size& initial_size) {
 }
 
 RenderWidgetHostView* WebContentsViewAndroid::CreateViewForWidget(
     RenderWidgetHost* render_widget_host) {
   if (render_widget_host->GetView()) {
     // During testing, the view will already be set up in most cases to the
@@ skipping 141 matching lines @@
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void WebContentsViewAndroid::TakeFocus(bool reverse) {
   if (web_contents_->GetDelegate() &&
       web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse))
     return;
   web_contents_->GetRenderWidgetHostView()->Focus();
 }
 
 } // namespace content