Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side Diff: content/browser/renderer_host/render_view_host.h

Issue 6724026: Clean up unload-related state after the ack is received. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with test flakiness fix CL. Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/renderer_host/render_view_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 // Causes the renderer to close the current page, including running its 172 // Causes the renderer to close the current page, including running its
173 // onunload event handler. A ClosePage_ACK message will be sent to the 173 // onunload event handler. A ClosePage_ACK message will be sent to the
174 // ResourceDispatcherHost when it is finished. 174 // ResourceDispatcherHost when it is finished.
175 // 175 //
176 // Please see ViewMsg_ClosePage in resource_messages_internal.h for a 176 // Please see ViewMsg_ClosePage in resource_messages_internal.h for a
177 // description of the parameters. 177 // description of the parameters.
178 void ClosePage(bool for_cross_site_transition, 178 void ClosePage(bool for_cross_site_transition,
179 int new_render_process_host_id, 179 int new_render_process_host_id,
180 int new_request_id); 180 int new_request_id);
181 181
182 // Called by ResourceDispatcherHost after the ClosePageACK is received.
183 void OnClosePageACK(bool for_cross_site_transition);
184
182 // Close the page ignoring whether it has unload events registers. 185 // Close the page ignoring whether it has unload events registers.
183 // This is called after the beforeunload and unload events have fired 186 // This is called after the beforeunload and unload events have fired
184 // and the user has agreed to continue with closing the page. 187 // and the user has agreed to continue with closing the page.
185 void ClosePageIgnoringUnloadEvents(); 188 void ClosePageIgnoringUnloadEvents();
186 189
187 // Sets whether this RenderViewHost has an outstanding cross-site request, 190 // Sets whether this RenderViewHost has an outstanding cross-site request,
188 // for which another renderer will need to run an onunload event handler. 191 // for which another renderer will need to run an onunload event handler.
189 // This is called before the first navigation event for this RenderViewHost, 192 // This is called before the first navigation event for this RenderViewHost,
190 // and again after the corresponding OnCrossSiteResponse. 193 // and again after the corresponding OnCrossSiteResponse.
191 void SetHasPendingCrossSiteRequest(bool has_pending_request, int request_id); 194 void SetHasPendingCrossSiteRequest(bool has_pending_request, int request_id);
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 // The termination status of the last render view that terminated. 715 // The termination status of the last render view that terminated.
713 base::TerminationStatus render_view_termination_status_; 716 base::TerminationStatus render_view_termination_status_;
714 717
715 // The enabled/disabled states of various commands. 718 // The enabled/disabled states of various commands.
716 std::map<RenderViewCommand, CommandState> command_states_; 719 std::map<RenderViewCommand, CommandState> command_states_;
717 720
718 DISALLOW_COPY_AND_ASSIGN(RenderViewHost); 721 DISALLOW_COPY_AND_ASSIGN(RenderViewHost);
719 }; 722 };
720 723
721 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_ 724 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698