Remove remaining WebContentsImpl from InterstitialPageImpl.

content/browser/web_contents/interstitial_page_impl.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/interstitial_page_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/browser/web_contents/navigation_entry_impl.h"
-#include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
 #include "content/port/browser/render_view_host_delegate_view.h"
 #include "content/port/browser/render_widget_host_view_port.h"
 #include "content/port/browser/web_contents_view_port.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/dom_operation_notification_details.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/storage_partition.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/page_transition_types.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
 
 namespace content {
@@ skipping 59 matching lines @@
 typedef std::map<WebContents*, InterstitialPageImpl*> InterstitialPageMap;
 static InterstitialPageMap* g_web_contents_to_interstitial_page;
 
 // Initializes g_web_contents_to_interstitial_page in a thread-safe manner.
 // Should be called before accessing g_web_contents_to_interstitial_page.
 static void InitInterstitialPageMap() {
   if (!g_web_contents_to_interstitial_page)
     g_web_contents_to_interstitial_page = new InterstitialPageMap;
 }
 
-InterstitialPage* InterstitialPage::Create(WebContents* web_contents,
-                                           bool new_navigation,
-                                           const GURL& url,
-                                           InterstitialPageDelegate* delegate) {
-  return new InterstitialPageImpl(
-      web_contents,
-      static_cast<RenderWidgetHostDelegate*>(
-          static_cast<WebContentsImpl*>(web_contents)),
-      new_navigation, url, delegate);
-}
-
 InterstitialPage* InterstitialPage::GetInterstitialPage(
     WebContents* web_contents) {
   InitInterstitialPageMap();
   InterstitialPageMap::const_iterator iter =
       g_web_contents_to_interstitial_page->find(web_contents);
   if (iter == g_web_contents_to_interstitial_page->end())
     return NULL;
 
   return iter->second;
 }
@@ skipping 682 matching lines @@
 void InterstitialPageImpl::InterstitialPageRVHDelegateView::GotFocus() {
   WebContents* web_contents = interstitial_page_->web_contents();
   if (web_contents && web_contents->GetDelegate())
     web_contents->GetDelegate()->WebContentsFocused(web_contents);
 }
 
 void InterstitialPageImpl::InterstitialPageRVHDelegateView::TakeFocus(
     bool reverse) {
   if (!interstitial_page_->web_contents())
     return;
-  WebContentsImpl* web_contents =
-      static_cast<WebContentsImpl*>(interstitial_page_->web_contents());
-  if (!web_contents->GetDelegateView())
-    return;
 
-  web_contents->GetDelegateView()->TakeFocus(reverse);
+  RenderViewHostDelegateView* view =
+      interstitial_page_->GetDelegateView();
+
+  if (view)
+    view->TakeFocus(reverse);
 }
 
 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
     int request_id, int number_of_matches, const gfx::Rect& selection_rect,
     int active_match_ordinal, bool final_update) {
 }
 
 }  // namespace content