Extract minimal RenderViewHost interface for embedders, leaving

content/browser/tab_contents/render_view_host_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/render_view_host_delegate.h"
 
 class InterstitialPageImpl;
 class NavigationControllerImpl;
 class RenderViewHost;
+class RenderViewHostImpl;
 class WebUIImpl;
 
 namespace content {
 class BrowserContext;
 class NavigationEntry;
 class NavigationEntryImpl;
 class RenderWidgetHostView;
 }
 
 // Manages RenderViewHosts for a TabContents. Normally there is only one and
@@ skipping 71 matching lines @@
   // For arguments, see TabContents constructor.
   void Init(content::BrowserContext* browser_context,
             content::SiteInstance* site_instance,
             int routing_id);
 
   // Returns the currently active RenderViewHost.
   //
   // This will be non-NULL between Init() and Shutdown(). You may want to NULL
   // check it in many cases, however. Windows can send us messages during the
   // destruction process after it has been shut down.
-  RenderViewHost* current_host() const {

[jam, 2012/02/29 01:40:47]

nit: this and below should return the Impl, since they're internal methods of
content

[Jói, 2012/03/02 10:40:36]

Done.

-    return render_view_host_;
-  }
+  RenderViewHost* current_host() const;
 
   // Returns the view associated with the current RenderViewHost, or NULL if
   // there is no current one.
   content::RenderWidgetHostView* GetRenderWidgetHostView() const;
 
   // Returns the pending render view host, or NULL if there is no pending one.
-  RenderViewHost* pending_render_view_host() const {
-    return pending_render_view_host_;
-  }
+  RenderViewHost* pending_render_view_host() const;
 
   // Returns the current committed Web UI or NULL if none applies.
   WebUIImpl* web_ui() const { return web_ui_.get(); }
 
   // Returns the Web UI for the pending navigation, or NULL of none applies.
   WebUIImpl* pending_web_ui() const { return pending_web_ui_.get(); }
 
   // Called when we want to instruct the renderer to navigate to the given
   // navigation entry. It may create a new RenderViewHost or re-use an existing
   // one. The RenderViewHost to navigate will be returned. Returns NULL if one
@@ skipping 123 matching lines @@
   // for the view type (like view source versus not).
   bool cross_navigation_pending_;
 
   // Implemented by the owner of this class, this delegate is installed into all
   // the RenderViewHosts that we create.
   content::RenderViewHostDelegate* render_view_delegate_;
 
   // Our RenderView host and its associated Web UI (if any, will be NULL for
   // non-DOM-UI pages). This object is responsible for all communication with
   // a child RenderView instance.
-  RenderViewHost* render_view_host_;
+  RenderViewHostImpl* render_view_host_;
   scoped_ptr<WebUIImpl> web_ui_;
 
   // A RenderViewHost used to load a cross-site page. This remains hidden
   // while a cross-site request is pending until it calls DidNavigate. It may
   // have an associated Web UI, in which case the Web UI pointer will be non-
   // NULL.
   //
   // The pending_web_ui may be non-NULL even when the pending_render_view_host_
   // is. This will happen when we're transitioning between two Web UI pages:
   // the RVH won't be swapped, so the pending pointer will be unused, but there
   // will be a pending Web UI associated with the navigation.
-  RenderViewHost* pending_render_view_host_;
+  RenderViewHostImpl* pending_render_view_host_;
   scoped_ptr<WebUIImpl> pending_web_ui_;
 
   // A map of site instance ID to swapped out RenderViewHosts.
-  typedef base::hash_map<int32, RenderViewHost*> RenderViewHostMap;
+  typedef base::hash_map<int32, RenderViewHostImpl*> RenderViewHostMap;
   RenderViewHostMap swapped_out_hosts_;
 
   // The intersitial page currently shown if any, not own by this class
   // (the InterstitialPage is self-owned, it deletes itself when hidden).
   InterstitialPageImpl* interstitial_page_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager);
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_