Index: content/browser/web_contents/web_contents_impl.h |
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h |
index a533ea13f9322d0dabaffa20d52eb479a8f619df..1af0d4e15855de7d2c3a9582147396dbaf0f997f 100644 |
--- a/content/browser/web_contents/web_contents_impl.h |
+++ b/content/browser/web_contents/web_contents_impl.h |
@@ -347,6 +347,9 @@ class CONTENT_EXPORT WebContentsImpl |
virtual void UpdateTargetURL(int32 page_id, const GURL& url) OVERRIDE; |
virtual void Close(RenderViewHost* render_view_host) OVERRIDE; |
virtual void RequestMove(const gfx::Rect& new_bounds) OVERRIDE; |
+ virtual void OnCrossSiteResponse( |
+ RenderViewHost* pending_render_view_host, |
+ const GlobalRequestID& global_request_id) OVERRIDE; |
virtual void SwappedOut(RenderViewHost* render_view_host) OVERRIDE; |
virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE; |
virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE; |
@@ -514,6 +517,16 @@ class CONTENT_EXPORT WebContentsImpl |
class DestructionObserver; |
+ // Tracks information about a navigation while a cross-process transition is |
+ // in progress. |
+ // TODO(creis): Add transfer navigation params for http://crbug.com/238331. |
+ struct PendingNavigationParams { |
+ PendingNavigationParams(); |
+ PendingNavigationParams(const GlobalRequestID& global_request_id); |
nasko
2013/06/05 18:17:07
The one argument constructor needs explicit keywor
Charlie Reis
2013/06/05 23:03:34
Done.
|
+ |
+ GlobalRequestID global_request_id; |
+ }; |
+ |
// See WebContents::Create for a description of these parameters. |
WebContentsImpl(BrowserContext* browser_context, |
WebContentsImpl* opener); |
@@ -803,6 +816,9 @@ class CONTENT_EXPORT WebContentsImpl |
// "waiting" or "loading." |
bool waiting_for_response_; |
+ // Tracks information about any current pending cross-process navigation. |
+ scoped_ptr<PendingNavigationParams> pending_nav_params_; |
+ |
// Map of SiteInstance ID to max page ID for this tab. A page ID is specific |
// to a given tab and SiteInstance, and must be valid for the lifetime of the |
// WebContentsImpl. |