Index: content/browser/frame_host/render_frame_host_manager.h |
diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h |
index b7039f5cbe7b8a6959f6c2d93bb69a65f7f27c21..61b5b26264c045d72c2138bdd88763bacb9a3bf4 100644 |
--- a/content/browser/frame_host/render_frame_host_manager.h |
+++ b/content/browser/frame_host/render_frame_host_manager.h |
@@ -227,7 +227,8 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver { |
// until ResumeResponseDeferredAtStart. |
void OnDeferredAfterResponseStarted( |
const GlobalRequestID& global_request_id, |
- RenderFrameHostImpl* pending_render_frame_host); |
+ RenderFrameHostImpl* pending_render_frame_host, |
+ const GURL& transition_url); |
// Resume navigation paused after receiving response headers. |
void ResumeResponseDeferredAtStart(); |
@@ -349,6 +350,19 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver { |
bool should_replace_current_entry; |
}; |
+ struct TransitionParams { |
+ TransitionParams(const GlobalRequestID& global_request_id, |
+ const GURL& transition_url); |
+ ~TransitionParams(); |
+ |
+ // The child ID and request ID for the pending navigation. Present whether |
+ // |request_transfer| is NULL or not. |
+ GlobalRequestID global_request_id; |
+ |
+ // This is the transition url used to store/lookup the current process id. |
+ GURL transition_url; |
+ }; |
+ |
// Used with FrameTree::ForEach to erase RenderFrameProxyHosts from a |
// FrameTreeNode's RenderFrameHostManager. |
static bool ClearProxiesInSiteInstance(int32 site_instance_id, |
@@ -470,7 +484,7 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver { |
// Tracks information about any navigation paused after receiving response |
// headers. |
- scoped_ptr<GlobalRequestID> response_started_id_; |
+ scoped_ptr<TransitionParams> response_started_params_; |
// If either of these is non-NULL, the pending navigation is to a chrome: |
// page. The scoped_ptr is used if pending_web_ui_ != web_ui_, the WeakPtr is |