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 fdcd564b6627cb5302c70bc5f40028c8cea6584e..be4ce381995a7623f2c4c7ee0f524aec4176f2b4 100644 |
--- a/content/browser/tab_contents/render_view_host_manager.h |
+++ b/content/browser/tab_contents/render_view_host_manager.h |
@@ -46,7 +46,7 @@ class CONTENT_EXPORT RenderViewHostManager |
public: |
// See tab_contents.h's implementation for more. |
virtual bool CreateRenderViewForRenderManager( |
- RenderViewHost* render_view_host) = 0; |
+ RenderViewHost* render_view_host, int opener_route_id) = 0; |
virtual void BeforeUnloadFiredFromRenderManager( |
bool proceed, bool* proceed_to_fire_unload) = 0; |
virtual void DidStartLoadingFromRenderManager( |
@@ -217,12 +217,14 @@ class CONTENT_EXPORT RenderViewHostManager |
// Helper method to create a pending RenderViewHost for a cross-site |
// navigation. |
bool CreatePendingRenderView(const NavigationEntry& entry, |
- SiteInstance* instance); |
+ SiteInstance* instance, |
+ int opener_route_id); |
// Sets up the necessary state for a new RenderViewHost navigating to the |
// given entry. |
bool InitRenderView(RenderViewHost* render_view_host, |
- const NavigationEntry& entry); |
+ const NavigationEntry& entry, |
+ int opener_route_id); |
// Sets the pending RenderViewHost/WebUI to be the active one. Note that this |
// doesn't require the pending render_view_host_ pointer to be non-NULL, since |
@@ -238,6 +240,11 @@ class CONTENT_EXPORT RenderViewHostManager |
// schedule new navigations in its swapped out RenderViewHosts after this. |
void RendererProcessClosing(content::RenderProcessHost* render_process_host); |
+ // Returns a swapped-out RenderViewHost for a navigation entry. This is used |
+ // to generate RVHs for the opener chain when we swap RVHs on a navigation. |
+ RenderViewHost* SwappedOutRVHForNavigationEntry(const NavigationEntry& entry, |
+ int opener_route_id); |
+ |
// Our delegate, not owned by us. Guaranteed non-NULL. |
Delegate* delegate_; |
@@ -278,6 +285,8 @@ class CONTENT_EXPORT RenderViewHostManager |
content::NotificationRegistrar registrar_; |
+ content::BrowserContext* browser_context_; |
+ |
DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager); |
}; |