diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-06 15:32:57 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-06 15:32:57 +0000 |
| commit | be05905f3121b7ef622b184c27012107bc06c56e (patch) | |
| tree | 86bce606ba6a47a779dd47c512b4c9897b453232 /chrome/browser/blocked_popup_container.h | |
| parent | 0e0fca32b226a29a774728b642848bfdd732f791 (diff) | |
| download | chromium_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.h')
| -rw-r--r-- | chrome/browser/blocked_popup_container.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/blocked_popup_container.h b/chrome/browser/blocked_popup_container.h index f0b0775..c632438 100644 --- a/chrome/browser/blocked_popup_container.h +++ b/chrome/browser/blocked_popup_container.h @@ -198,6 +198,12 @@ class BlockedPopupContainer : public TabContentsDelegate, // string is hostname. bool is whitelisted status. typedef std::map<std::string, bool> PopupHosts; + // Creates a BlockedPopupContainer, anchoring the container to the lower + // right corner using the given BlockedPopupContainerView. Use only for + // testing. + static BlockedPopupContainer* Create(TabContents* owner, Profile* profile, + BlockedPopupContainerView* view); + // Hides the UI portion of the container. void HideSelf(); @@ -217,6 +223,7 @@ class BlockedPopupContainer : public TabContentsDelegate, private: friend class BlockedPopupContainerImpl; friend class BlockedPopupContainerTest; + friend class BlockedPopupContainerControllerTest; // string is hostname. typedef std::set<std::string> Whitelist; |