Eliminate SwapOut message parameters, keeping state in RVHM instead.

content/browser/web_contents/web_contents_impl.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_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 329 matching lines @@
                            const PageState& page_state) OVERRIDE;
   virtual void UpdateTitle(RenderViewHost* render_view_host,
                            int32 page_id,
                            const string16& title,
                            base::i18n::TextDirection title_direction) OVERRIDE;
   virtual void UpdateEncoding(RenderViewHost* render_view_host,
                               const std::string& encoding) OVERRIDE;
   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;
   virtual void DidCancelLoading() OVERRIDE;
   virtual void DidChangeLoadProgress(double progress) OVERRIDE;
   virtual void DidDisownOpener(RenderViewHost* rvh) OVERRIDE;
   virtual void DidAccessInitialDocument() OVERRIDE;
   virtual void DocumentAvailableInMainFrame(
       RenderViewHost* render_view_host) OVERRIDE;
   virtual void DocumentOnLoadCompletedInMainFrame(
@@ skipping 147 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(RenderViewHostManagerTest, PageDoesBackAndReload);
 
   // So InterstitialPageImpl can access SetIsLoading.
   friend class InterstitialPageImpl;
 
   // TODO(brettw) TestWebContents shouldn't exist!
   friend class TestWebContents;
 
   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 keyword.

[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);
 
   // Add and remove observers for page navigation notifications. Adding or
   // removing multiple times has no effect. The order in which notifications
   // are sent to observers is undefined. Clients must be sure to remove the
   // observer before they go away.
   void AddObserver(WebContentsObserver* observer);
   void RemoveObserver(WebContentsObserver* observer);
@@ skipping 269 matching lines @@
 
   // Indicates if the tab is considered crashed.
   base::TerminationStatus crashed_status_;
   int crashed_error_code_;
 
   // Whether this WebContents is waiting for a first-response for the
   // main resource of the page. This controls whether the throbber state is
   // "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.
   std::map<int32, int32> max_page_ids_;
 
   // System time at which the current load was started.
   base::TimeTicks current_load_start_;
 
   // The current load state and the URL associated with it.
   net::LoadStateWithParam load_state_;
@@ skipping 128 matching lines @@
   // Maps the ids of pending image downloads to their callbacks
   typedef std::map<int, ImageDownloadCallback> ImageDownloadMap;
   ImageDownloadMap image_download_map_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_