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

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

Issue 6627063: Ignore JavaScript messages (alert/confirm/prompt) during unload handlers. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Added a browsertest 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 side-by-side diff with in-line comments
Download patch
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 1ee71b1c6285e213dfe6ef2151a25eedb49f4dd8..537b8717b09db7b10d4760538bb8c456c0e77596 100644
--- a/content/browser/renderer_host/render_view_host.cc
+++ b/content/browser/renderer_host/render_view_host.cc
@@ -1205,13 +1205,14 @@ void RenderViewHost::OnMsgRunJavaScriptMessage(
const std::wstring& default_prompt,
const GURL& frame_url,
const int flags,
+ const bool unload_handler_being_run,
IPC::Message* reply_msg) {
// While a JS message dialog is showing, tabs in the same process shouldn't
// process input events.
process()->set_ignore_input_events(true);
StopHangMonitorTimeout();
delegate_->RunJavaScriptMessage(message, default_prompt, frame_url, flags,
- reply_msg,
+ unload_handler_being_run, reply_msg,
&are_javascript_messages_suppressed_);
}
« no previous file with comments | « content/browser/renderer_host/render_view_host.h ('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