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

Unified Diff: chrome/browser/web_contents.cc

Issue 9477: Continue with crosssite navigations if alerts are suppressed... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 1 month 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
« chrome/browser/render_view_host.cc ('K') | « chrome/browser/web_contents.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/web_contents.cc
===================================================================
--- chrome/browser/web_contents.cc (revision 4898)
+++ chrome/browser/web_contents.cc (working copy)
@@ -1067,7 +1067,8 @@
const std::wstring& message,
const std::wstring& default_prompt,
const int flags,
- IPC::Message* reply_msg) {
+ IPC::Message* reply_msg,
+ bool* did_suppress_message) {
// Suppress javascript messages when requested and when inside a constrained
// popup window (because that activates them and breaks them out of the
// constrained window jail).
@@ -1075,6 +1076,8 @@
if (delegate())
suppress_this_message |= delegate()->IsPopup(this);
+ *did_suppress_message = suppress_this_message;
+
if (!suppress_this_message) {
TimeDelta time_since_last_message(
TimeTicks::Now() - last_javascript_message_dismissal_);
« chrome/browser/render_view_host.cc ('K') | « chrome/browser/web_contents.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698