summaryrefslogtreecommitdiffstats
path: root/chrome/browser/blocked_popup_container.cc
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-06 15:32:57 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-06 15:32:57 +0000
commitbe05905f3121b7ef622b184c27012107bc06c56e (patch)
tree86bce606ba6a47a779dd47c512b4c9897b453232 /chrome/browser/blocked_popup_container.cc
parent0e0fca32b226a29a774728b642848bfdd732f791 (diff)
downloadchromium_src-be05905f3121b7ef622b184c27012107bc06c56e.zip
chromium_src-be05905f3121b7ef622b184c27012107bc06c56e.tar.gz
chromium_src-be05905f3121b7ef622b184c27012107bc06c56e.tar.bz2
Add remaining functionality for popup blocker: popup menu to unblock individual popups and whitelist sites. Also fixes intermittant leak on valgrind bots from poorly constructed unit test.
BUG=13160, 15818 TEST=unblocking popups, whitelisting sites, and unwhitelisting them. Green valgrind bot. Review URL: http://codereview.chromium.org/149145 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19944 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/blocked_popup_container.cc')
-rw-r--r--chrome/browser/blocked_popup_container.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/blocked_popup_container.cc b/chrome/browser/blocked_popup_container.cc
index 49b5012..65d2e09 100644
--- a/chrome/browser/blocked_popup_container.cc
+++ b/chrome/browser/blocked_popup_container.cc
@@ -22,6 +22,15 @@ BlockedPopupContainer* BlockedPopupContainer::Create(
}
// static
+BlockedPopupContainer* BlockedPopupContainer::Create(
+ TabContents* owner, Profile* profile, BlockedPopupContainerView* view) {
+ BlockedPopupContainer* container =
+ new BlockedPopupContainer(owner, profile->GetPrefs());
+ container->set_view(view);
+ return container;
+}
+
+// static
void BlockedPopupContainer::RegisterUserPrefs(PrefService* prefs) {
prefs->RegisterListPref(prefs::kPopupWhitelistedHosts);
}