| Index: content/browser/tab_contents/render_view_host_manager.h
|
| diff --git a/content/browser/tab_contents/render_view_host_manager.h b/content/browser/tab_contents/render_view_host_manager.h
|
| index 06692136f69090ee6cf3eeef6c8774b80f7f27fb..179a400ebe0abddcfdb1868c34013f2a86ab0d05 100644
|
| --- a/content/browser/tab_contents/render_view_host_manager.h
|
| +++ b/content/browser/tab_contents/render_view_host_manager.h
|
| @@ -18,6 +18,7 @@
|
| class InterstitialPageImpl;
|
| class NavigationControllerImpl;
|
| class RenderViewHost;
|
| +class RenderViewHostImpl;
|
| class WebUIImpl;
|
|
|
| namespace content {
|
| @@ -109,18 +110,14 @@ class CONTENT_EXPORT RenderViewHostManager
|
| // 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 {
|
| - return render_view_host_;
|
| - }
|
| + RenderViewHostImpl* 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_;
|
| - }
|
| + RenderViewHostImpl* pending_render_view_host() const;
|
|
|
| // Returns the current committed Web UI or NULL if none applies.
|
| WebUIImpl* web_ui() const { return web_ui_.get(); }
|
| @@ -132,7 +129,7 @@ class CONTENT_EXPORT RenderViewHostManager
|
| // 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
|
| // could not be created.
|
| - RenderViewHost* Navigate(const content::NavigationEntryImpl& entry);
|
| + RenderViewHostImpl* Navigate(const content::NavigationEntryImpl& entry);
|
|
|
| // Instructs the various live views to stop. Called when the user directed the
|
| // page to stop loading.
|
| @@ -242,7 +239,7 @@ class CONTENT_EXPORT RenderViewHostManager
|
| // Helper method to terminate the pending RenderViewHost.
|
| void CancelPending();
|
|
|
| - RenderViewHost* UpdateRendererStateForNavigate(
|
| + RenderViewHostImpl* UpdateRendererStateForNavigate(
|
| const content::NavigationEntryImpl& entry);
|
|
|
| // Called when a renderer process is starting to close. We should not
|
| @@ -264,7 +261,7 @@ class CONTENT_EXPORT RenderViewHostManager
|
| // 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
|
| @@ -276,11 +273,11 @@ class CONTENT_EXPORT RenderViewHostManager
|
| // 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
|
|
|