diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-18 19:52:40 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-18 19:52:40 +0000 |
| commit | 1ef5ad42064c8ef0d1503b68a7fbac01887ca093 (patch) | |
| tree | 34a32b11a9db6f69fef27e7e81863d82a29bcd2d /chrome/browser/views/blocked_popup_container.cc | |
| parent | 59b49a66c3cd959fcf9d7b4bd9c6d88c70b39919 (diff) | |
| download | chromium_src-1ef5ad42064c8ef0d1503b68a7fbac01887ca093.zip chromium_src-1ef5ad42064c8ef0d1503b68a7fbac01887ca093.tar.gz chromium_src-1ef5ad42064c8ef0d1503b68a7fbac01887ca093.tar.bz2 | |
Reverting 14005.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/blocked_popup_container.cc')
| -rw-r--r-- | chrome/browser/views/blocked_popup_container.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc index 3906d5b..ca5b996 100644 --- a/chrome/browser/views/blocked_popup_container.cc +++ b/chrome/browser/views/blocked_popup_container.cc @@ -254,12 +254,12 @@ void BlockedPopupContainer::AddTabContents(TabContents* blocked_contents, const gfx::Rect& bounds) { if (has_been_dismissed_) { // We simply bounce this popup without notice. - delete blocked_contents; + blocked_contents->CloseContents(); return; } if (blocked_popups_.size() > kImpossibleNumberOfPopups) { - delete blocked_contents; + blocked_contents->CloseContents(); LOG(INFO) << "Warning: Renderer is sending more popups to us then should be" " possible. Renderer compromised?"; return; @@ -477,7 +477,7 @@ void BlockedPopupContainer::SetPosition() { void BlockedPopupContainer::CloseEachTabContents() { while (!blocked_popups_.empty()) { blocked_popups_.back().first->set_delegate(NULL); - delete blocked_popups_.back().first; + blocked_popups_.back().first->CloseContents(); blocked_popups_.pop_back(); } |