summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-25 20:32:48 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-25 20:32:48 +0000
commit985fdf993dc9d6623ca36243e8546fcb781a9af1 (patch)
tree052d0eacd83df6b9d5bd81214ec3d747f80c04eb /chrome/browser
parentd24305956ba17de0317954d0e0a2a72cddf13c39 (diff)
downloadchromium_src-985fdf993dc9d6623ca36243e8546fcb781a9af1.zip
chromium_src-985fdf993dc9d6623ca36243e8546fcb781a9af1.tar.gz
chromium_src-985fdf993dc9d6623ca36243e8546fcb781a9af1.tar.bz2
Set the delegate on incoming TabContents in BlockedPopupContainer::ReplaceContents.
Review URL: http://codereview.chromium.org/12646 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/views/blocked_popup_container.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc
index 63f6eb8..9fafe5b 100644
--- a/chrome/browser/views/blocked_popup_container.cc
+++ b/chrome/browser/views/blocked_popup_container.cc
@@ -172,8 +172,8 @@ void BlockedPopupContainerView::Layout() {
gfx::Size sz = popup_count_label_->GetPreferredSize();
popup_count_label_->SetBounds(kSmallPadding, kSmallPadding,
- sz.width(),
- sz.height());
+ sz.width(),
+ sz.height());
int close_button_padding =
static_cast<int>(ceil(panel_size.height() / 2.0) -
@@ -398,8 +398,10 @@ void BlockedPopupContainer::ReplaceContents(TabContents* source,
}
}
- if (found)
+ if (found) {
+ new_contents->set_delegate(this);
blocked_popups_.push_back(std::make_pair(new_contents, rect));
+ }
}
void BlockedPopupContainer::AddNewContents(TabContents* source,