Extract minimal RenderViewHost interface for embedders, leaving

content/browser/tab_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/tab_contents/interstitial_page_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 151 matching lines @@
                                            InterstitialPageDelegate* delegate)
     : tab_(static_cast<TabContents*>(tab)),
       url_(url),
       new_navigation_(new_navigation),
       should_discard_pending_nav_entry_(new_navigation),
       reload_on_dont_proceed_(false),
       enabled_(true),
       action_taken_(NO_ACTION),
       render_view_host_(NULL),
       original_child_id_(tab->GetRenderProcessHost()->GetID()),
-      original_rvh_id_(tab->GetRenderViewHost()->routing_id()),
+      original_rvh_id_(tab->GetRenderViewHost()->GetRoutingID()),
       should_revert_tab_title_(false),
       tab_was_loading_(false),
       resource_dispatcher_host_notified_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(rvh_view_delegate_(
           new InterstitialPageRVHViewDelegate(this))),
       create_view_(true),
       delegate_(delegate) {
   InitInterstitialPageMap();
   // It would be inconsistent to create an interstitial with no new navigation
   // (which is the case when the interstitial was triggered by a sub-resource on
@@ skipping 50 matching lines @@
     entry->SetVirtualURL(url_);
     entry->set_page_type(content::PAGE_TYPE_INTERSTITIAL);
 
     // Give delegates a chance to set some states on the navigation entry.
     delegate_->OverrideEntry(entry);
 
     tab_->GetControllerImpl().AddTransientEntry(entry);
   }
 
   DCHECK(!render_view_host_);
-  render_view_host_ = CreateRenderViewHost();
+  render_view_host_ = static_cast<RenderViewHostImpl*>(CreateRenderViewHost());
   CreateWebContentsView();
 
   std::string data_url = "data:text/html;charset=utf-8," +
                          net::EscapePath(delegate_->GetHTMLContents());
   render_view_host_->NavigateToURL(GURL(data_url));
 
   notification_registrar_.Add(this,
                               content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
                               content::Source<WebContents>(tab_));
   notification_registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<NavigationController>(&tab_->GetController()));
   notification_registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
       content::Source<NavigationController>(&tab_->GetController()));
   notification_registrar_.Add(
       this, content::NOTIFICATION_DOM_OPERATION_RESPONSE,
       content::Source<RenderViewHost>(render_view_host_));
 }
 
 void InterstitialPageImpl::Hide() {
-  RenderWidgetHostView* old_view = tab_->GetRenderViewHost()->view();
+  RenderWidgetHostView* old_view = tab_->GetRenderViewHost()->GetView();
   if (tab_->GetInterstitialPage() == this &&
       old_view && !old_view->IsShowing()) {
     // Show the original RVH since we're going away.  Note it might not exist if
     // the renderer crashed while the interstitial was showing.
     // Note that it is important that we don't call Show() if the view is
     // already showing. That would result in bad things (unparented HWND on
     // Windows for example) happening.
     old_view->Show();
   }
 
   // If the focus was on the interstitial, let's keep it to the page.
   // (Note that in unit-tests the RVH may not have a view).
-  if (render_view_host_->view() && render_view_host_->view()->HasFocus() &&
-      tab_->GetRenderViewHost()->view()) {
+  if (render_view_host_->GetView() &&
+      render_view_host_->GetView()->HasFocus() &&
+      tab_->GetRenderViewHost()->GetView()) {
     RenderWidgetHostViewPort::FromRWHV(
-        tab_->GetRenderViewHost()->view())->Focus();
+        tab_->GetRenderViewHost()->GetView())->Focus();
   }
 
   render_view_host_->Shutdown();
   render_view_host_ = NULL;
   if (tab_->GetInterstitialPage())
     tab_->remove_interstitial_page();
   // Let's revert to the original title if necessary.
   NavigationEntry* entry = tab_->GetController().GetActiveEntry();
   if (!new_navigation_ && should_revert_tab_title_) {
     entry->SetTitle(original_tab_title_);
@@ skipping 27 matching lines @@
       // request won't be blocked if the same RenderViewHost was used for the
       // new navigation.
       Disable();
       TakeActionOnResourceDispatcher(CANCEL);
       break;
     case content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED:
       if (action_taken_ == NO_ACTION) {
         // The RenderViewHost is being destroyed (as part of the tab being
         // closed); make sure we clear the blocked requests.
         RenderViewHost* rvh = static_cast<RenderViewHost*>(
-            content::Source<RenderWidgetHost>(source).ptr());
-        DCHECK(rvh->process()->GetID() == original_child_id_ &&
-               rvh->routing_id() == original_rvh_id_);
+            static_cast<RenderViewHostImpl*>(
+                RenderWidgetHostImpl::From(
+                    content::Source<RenderWidgetHost>(source).ptr())));
+        DCHECK(rvh->GetProcess()->GetID() == original_child_id_ &&
+               rvh->GetRoutingID() == original_rvh_id_);
         TakeActionOnResourceDispatcher(CANCEL);
       }
       break;
     case content::NOTIFICATION_WEB_CONTENTS_DESTROYED:
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED:
       if (action_taken_ == NO_ACTION) {
         // We are navigating away from the interstitial or closing a tab with an
         // interstitial.  Default to DontProceed(). We don't just call Hide as
         // subclasses will almost certainly override DontProceed to do some work
         // (ex: close pending connections).
@@ skipping 42 matching lines @@
   if (!enabled_) {
     DontProceed();
     return;
   }
   if (params.transition == content::PAGE_TRANSITION_AUTO_SUBFRAME) {
     // No need to handle navigate message from iframe in the interstitial page.
     return;
   }
 
   // The RenderViewHost has loaded its contents, we can show it now.
-  render_view_host_->view()->Show();
+  render_view_host_->GetView()->Show();
   tab_->set_interstitial_page(this);
 
   // This notification hides the bookmark bar. Note that this has to happen
   // after the interstitial page was registered with |tab_|, since there will be
   // a callback to |tab_| testing if an interstitial page is showing before
   // hiding the bookmark bar.
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_INTERSTITIAL_ATTACHED,
       content::Source<WebContents>(tab_),
       content::NotificationService::NoDetails());
 
-  RenderWidgetHostView* rwh_view = tab_->GetRenderViewHost()->view();
+  RenderWidgetHostView* rwh_view = tab_->GetRenderViewHost()->GetView();
 
   // The RenderViewHost may already have crashed before we even get here.
   if (rwh_view) {
     // If the page has focus, focus the interstitial.
     if (rwh_view->HasFocus())
       Focus();
 
     // Hide the original RVH since we're showing the interstitial instead.
     rwh_view->Hide();
   }
@@ skipping 58 matching lines @@
 void InterstitialPageImpl::HandleKeyboardEvent(
       const NativeWebKeyboardEvent& event) {
   return tab_->HandleKeyboardEvent(event);
 }
 
 WebContents* InterstitialPageImpl::tab() const {
   return tab_;
 }
 
 RenderViewHost* InterstitialPageImpl::CreateRenderViewHost() {
-  RenderViewHost* render_view_host = new RenderViewHost(
+  RenderViewHostImpl* render_view_host = new RenderViewHostImpl(
       SiteInstance::Create(tab()->GetBrowserContext()),
       this, MSG_ROUTING_NONE, kInvalidSessionStorageNamespaceId);
   return render_view_host;
 }
 
 WebContentsView* InterstitialPageImpl::CreateWebContentsView() {
   if (!create_view_)
     return NULL;
   WebContentsView* web_contents_view = tab()->GetView();
   RenderWidgetHostView* view =
       web_contents_view->CreateViewForWidget(render_view_host_);
   render_view_host_->SetView(view);
   render_view_host_->AllowBindings(content::BINDINGS_POLICY_DOM_AUTOMATION);
 
   int32 max_page_id =
-      tab()->GetMaxPageIDForSiteInstance(render_view_host_->site_instance());
+      tab()->GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance());
   render_view_host_->CreateRenderView(string16(), max_page_id);
   view->SetSize(web_contents_view->GetContainerSize());
   // Don't show the interstitial until we have navigated to it.
   view->Hide();
   return web_contents_view;
 }
 
 void InterstitialPageImpl::Proceed() {
   if (action_taken_ != NO_ACTION) {
     NOTREACHED();
@@ skipping 70 matching lines @@
   if (new_navigation_)
     TakeActionOnResourceDispatcher(RESUME);
   else
     TakeActionOnResourceDispatcher(CANCEL);
 }
 
 void InterstitialPageImpl::SetSize(const gfx::Size& size) {
 #if !defined(OS_MACOSX)
   // When a tab is closed, we might be resized after our view was NULLed
   // (typically if there was an info-bar).
-  if (render_view_host_->view())
-    render_view_host_->view()->SetSize(size);
+  if (render_view_host_->GetView())
+    render_view_host_->GetView()->SetSize(size);
 #else
   // TODO(port): Does Mac need to SetSize?
   NOTIMPLEMENTED();
 #endif
 }
 
 void InterstitialPageImpl::Focus() {
   // Focus the native window.
-  RenderWidgetHostViewPort::FromRWHV(render_view_host_->view())->Focus();
+  RenderWidgetHostViewPort::FromRWHV(render_view_host_->GetView())->Focus();
 }
 
 void InterstitialPageImpl::FocusThroughTabTraversal(bool reverse) {
   render_view_host_->SetInitialFocus(reverse);
 }
 
 RenderViewHost* InterstitialPageImpl::GetRenderViewHostForTesting() const {
   return render_view_host_;
 }
 
@@ skipping 26 matching lines @@
     if (resource_dispatcher_host_notified_)
       return;
     resource_dispatcher_host_notified_ = true;
   }
 
   // The tab might not have a render_view_host if it was closed (in which case,
   // we have taken care of the blocked requests when processing
   // NOTIFY_RENDER_WIDGET_HOST_DESTROYED.
   // Also we need to test there is a ResourceDispatcherHost, as when unit-tests
   // we don't have one.
-  RenderViewHost* rvh = RenderViewHost::FromID(original_child_id_,
-                                               original_rvh_id_);
+  RenderViewHostImpl* rvh = RenderViewHostImpl::FromID(original_child_id_,
+                                                       original_rvh_id_);
   if (!rvh || !ResourceDispatcherHost::Get())
     return;
 
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(
           &ResourceRequestHelper,
           ResourceDispatcherHost::Get(),
           original_child_id_,
@@ skipping 77 matching lines @@
   if (!tab->GetViewDelegate())
     return;
 
   tab->GetViewDelegate()->TakeFocus(reverse);
 }
 
 void InterstitialPageImpl::InterstitialPageRVHViewDelegate::OnFindReply(
     int request_id, int number_of_matches, const gfx::Rect& selection_rect,
     int active_match_ordinal, bool final_update) {
 }