Merge 79440 - Clean up unload-related state after the ack is received.

content/browser/renderer_host/render_view_host.h

 // Copyright (c) 2011 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_RENDERER_HOST_RENDER_VIEW_HOST_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 162 matching lines @@
   // Causes the renderer to close the current page, including running its
   // onunload event handler.  A ClosePage_ACK message will be sent to the
   // ResourceDispatcherHost when it is finished.
   //
   // Please see ViewMsg_ClosePage in resource_messages_internal.h for a
   // description of the parameters.
   void ClosePage(bool for_cross_site_transition,
                  int new_render_process_host_id,
                  int new_request_id);
 
+  // Called by ResourceDispatcherHost after the ClosePageACK is received.
+  void OnClosePageACK(bool for_cross_site_transition);
+
   // Close the page ignoring whether it has unload events registers.
   // This is called after the beforeunload and unload events have fired
   // and the user has agreed to continue with closing the page.
   void ClosePageIgnoringUnloadEvents();
 
   // Sets whether this RenderViewHost has an outstanding cross-site request,
   // for which another renderer will need to run an onunload event handler.
   // This is called before the first navigation event for this RenderViewHost,
   // and again after the corresponding OnCrossSiteResponse.
   void SetHasPendingCrossSiteRequest(bool has_pending_request, int request_id);
@@ skipping 541 matching lines @@
   // The termination status of the last render view that terminated.
   base::TerminationStatus render_view_termination_status_;
 
   // The enabled/disabled states of various commands.
   std::map<RenderViewCommand, CommandState> command_states_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHost);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_