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

Unified Diff: content/browser/renderer_host/render_view_host.cc

Issue 6904039: Update the URL if the user cancels a beforeunload handler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add missing file. Created 9 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/data/beforeunload.html ('k') | content/browser/renderer_host/render_view_host_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_view_host.cc
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc
index 4c61c11ab0ab0e0ea1b46c6f89ef9f2ee3919595..8e1bb6ac7fba2a988da7d35063a29b4872a004bb 100644
--- a/content/browser/renderer_host/render_view_host.cc
+++ b/content/browser/renderer_host/render_view_host.cc
@@ -1325,6 +1325,10 @@ void RenderViewHost::OnMsgShouldCloseACK(bool proceed) {
management_delegate->ShouldClosePage(
unload_ack_is_for_cross_site_transition_, proceed);
}
+
+ // If canceled, notify the delegate to cancel its pending navigation entry.
+ if (!proceed)
+ delegate_->DidCancelLoading();
}
void RenderViewHost::WindowMoveOrResizeStarted() {
« no previous file with comments | « chrome/test/data/beforeunload.html ('k') | content/browser/renderer_host/render_view_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698