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

Unified Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 149261: Disimiss JS message boxes when an interstitial is showing (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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: chrome/browser/tab_contents/tab_contents.cc
===================================================================
--- chrome/browser/tab_contents/tab_contents.cc (revision 20029)
+++ chrome/browser/tab_contents/tab_contents.cc (working copy)
@@ -1929,7 +1929,11 @@
// 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).
- bool suppress_this_message = suppress_javascript_messages_;
+ // Also suppress messages when showing an interstitial. The interstitial is
+ // shown over the previous page, we don't want the hidden page dialogs to
+ // interfere with the interstitial.
+ bool suppress_this_message = suppress_javascript_messages_ ||
+ showing_interstitial_page();
if (delegate())
suppress_this_message |=
(delegate()->GetConstrainingContents(this) != this);

Powered by Google App Engine
This is Rietveld 408576698