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

chrome/renderer/render_view.h

 // Copyright (c) 2009 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 CHROME_RENDERER_RENDER_VIEW_H_
 #define CHROME_RENDERER_RENDER_VIEW_H_
 
 #include <string>
 #include <queue>
 #include <vector>
@@ skipping 38 matching lines @@
 class GURL;
 class ListValue;
 class NavigationState;
 class PrintWebViewHelper;
 class WebFrame;
 class WebPluginDelegate;
 class WebPluginDelegateProxy;
 class WebDevToolsAgentDelegate;
 struct ContextMenuMediaParams;
 struct ThumbnailScore;
+struct ViewMsg_ClosePage_Params;
 struct ViewMsg_Navigate_Params;
 struct ViewMsg_UploadFile_Params;
 struct WebDropData;
 
 namespace base {
 class WaitableEvent;
 }
 
 namespace webkit_glue {
 struct FileUploadData;
@@ skipping 480 matching lines @@
                                 const ListValue& args);
 
   void OnMoveOrResizeStarted();
 
   // Checks if the RenderView should close, runs the beforeunload handler and
   // sends ViewMsg_ShouldClose to the browser.
   void OnMsgShouldClose();
 
   // Runs the onunload handler and closes the page, replying with ClosePage_ACK
   // (with the given RPH and request IDs, to help track the request).
-  void OnClosePage(int new_render_process_host_id, int new_request_id);
+  void OnClosePage(const ViewMsg_ClosePage_Params& params);
 
   // Notification about ui theme changes.
   void OnThemeChanged();
 
   // Notification that we have received autofill suggestion.
   void OnReceivedAutofillSuggestions(
       int64 node_id,
       int request_id,
       const std::vector<std::wstring>& suggestions,
       int default_suggestions_index);
@@ skipping 235 matching lines @@
   // PrintWebViewHelper handles printing.  Note that this object is constructed
   // when printing for the first time but only destroyed with the RenderView.
   scoped_ptr<PrintWebViewHelper> print_helper_;
 
   RendererPreferences renderer_preferences_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderView);
 };
 
 #endif  // CHROME_RENDERER_RENDER_VIEW_H_