Index: content/browser/web_contents/interstitial_page_impl.cc |
diff --git a/content/browser/web_contents/interstitial_page_impl.cc b/content/browser/web_contents/interstitial_page_impl.cc |
index 44d28e187daae1661ccbafb1379103c83a8e9943..7819c198e0397b281400d1a13da340ec736f165b 100644 |
--- a/content/browser/web_contents/interstitial_page_impl.cc |
+++ b/content/browser/web_contents/interstitial_page_impl.cc |
@@ -21,7 +21,6 @@ |
#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" |
@@ -35,6 +34,7 @@ |
#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" |
@@ -114,17 +114,6 @@ static void InitInterstitialPageMap() { |
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(); |
@@ -827,12 +816,12 @@ 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( |