diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-11 20:13:44 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-11 20:13:44 +0000 |
| commit | c274acc67753226943c28e01f24307610bb8c5c0 (patch) | |
| tree | 96a8342ddb53a3162f0748ebe90dc167bde86230 /chrome/browser/web_contents.cc | |
| parent | 00b64f3980da6ce2c42007c14952f613c4adc640 (diff) | |
| download | chromium_src-c274acc67753226943c28e01f24307610bb8c5c0.zip chromium_src-c274acc67753226943c28e01f24307610bb8c5c0.tar.gz chromium_src-c274acc67753226943c28e01f24307610bb8c5c0.tar.bz2 | |
Only block alert() requests from blocked popups; not all popups.
Add two unit tests to make sure we do the right thing; required
adding a bunch of stuff to the automation layer.
Review URL: http://codereview.chromium.org/10282
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_contents.cc')
| -rw-r--r-- | chrome/browser/web_contents.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/web_contents.cc b/chrome/browser/web_contents.cc index acd9338..e936aac 100644 --- a/chrome/browser/web_contents.cc +++ b/chrome/browser/web_contents.cc @@ -1082,7 +1082,8 @@ void WebContents::RunJavaScriptMessage( // constrained window jail). bool suppress_this_message = suppress_javascript_messages_; if (delegate()) - suppress_this_message |= delegate()->IsPopup(this); + suppress_this_message |= + (delegate()->GetConstrainingContents(this) != NULL); *did_suppress_message = suppress_this_message; |