diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 00:56:32 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 00:56:32 +0000 |
| commit | dcbfa96ce5fdecd4c0504c167ff576e9adb51df6 (patch) | |
| tree | 44c01c21b39638def0987d6abcdc8eae52193850 /chrome/browser/blocked_popup_container.cc | |
| parent | e329b6e6ce31f4f129d335c0d2ca4411ac85431f (diff) | |
| download | chromium_src-dcbfa96ce5fdecd4c0504c167ff576e9adb51df6.zip chromium_src-dcbfa96ce5fdecd4c0504c167ff576e9adb51df6.tar.gz chromium_src-dcbfa96ce5fdecd4c0504c167ff576e9adb51df6.tar.bz2 | |
Merge 37143 - Associate popups with the top level frame instead of the security origin.
Associate popups with the top level frame instead of the security
origin.
No longer send the creator from the renderer to the browser since
this was all it was used for.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/543199
TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/553107
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@37192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/blocked_popup_container.cc')
| -rw-r--r-- | chrome/browser/blocked_popup_container.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/blocked_popup_container.cc b/chrome/browser/blocked_popup_container.cc index 2422c2b..183a125 100644 --- a/chrome/browser/blocked_popup_container.cc +++ b/chrome/browser/blocked_popup_container.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this +// Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this // source code is governed by a BSD-style license that can be found in the // LICENSE file. @@ -44,7 +44,7 @@ void BlockedPopupContainer::AddTabContents(TabContents* tab_contents, // Show whitelisted popups immediately. bool whitelisted = !!whitelist_.count(host); if (whitelisted) - owner_->AddNewContents(tab_contents, NEW_POPUP, bounds, true, GURL()); + owner_->AddNewContents(tab_contents, NEW_POPUP, bounds, true); if (has_been_dismissed_) { // Don't want to show any other UI. @@ -91,7 +91,7 @@ void BlockedPopupContainer::LaunchPopupAtIndex(size_t index) { BlockedPopups::iterator i(blocked_popups_.begin() + index); TabContents* tab_contents = i->tab_contents; tab_contents->set_delegate(NULL); - owner_->AddNewContents(tab_contents, NEW_POPUP, i->bounds, true, GURL()); + owner_->AddNewContents(tab_contents, NEW_POPUP, i->bounds, true); const std::string& host = i->host; if (!host.empty()) { @@ -244,7 +244,7 @@ void BlockedPopupContainer::AddNewContents(TabContents* source, const gfx::Rect& initial_position, bool user_gesture) { owner_->AddNewContents(new_contents, disposition, initial_position, - user_gesture, GURL()); + user_gesture); } void BlockedPopupContainer::CloseContents(TabContents* source) { |