Merge 21531 - Fix a race condition where rapid back/forward clicks could clos...

chrome/browser/renderer_host/resource_dispatcher_host.h

Index: chrome/browser/renderer_host/resource_dispatcher_host.h
===================================================================
--- chrome/browser/renderer_host/resource_dispatcher_host.h	(revision 21759)
+++ chrome/browser/renderer_host/resource_dispatcher_host.h	(working copy)
@@ -40,6 +40,7 @@
 class URLRequestContext;
 class WebKitThread;
 struct ViewHostMsg_Resource_Request;
+struct ViewMsg_ClosePage_Params;
 
 class ResourceDispatcherHost : public URLRequest::Delegate {
  public:
@@ -298,7 +299,7 @@
   MessageLoop* ui_loop() const { return ui_loop_; }
 
   // Called when the onunload handler for a cross-site request has finished.
-  void OnClosePageACK(int process_id, int request_id);
+  void OnClosePageACK(const ViewMsg_ClosePage_Params& params);
 
   // Force cancels any pending requests for the given process.
   void CancelRequestsForProcess(int process_id);
Property changes on: chrome\browser\renderer_host\resource_dispatcher_host.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/renderer_host/resource_dispatcher_host.h:r21531