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/cocoa/blocked_popup_container_controller.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/cocoa/blocked_popup_container_controller.h')
| -rw-r--r-- | chrome/browser/cocoa/blocked_popup_container_controller.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/blocked_popup_container_controller.h b/chrome/browser/cocoa/blocked_popup_container_controller.h index 39cba6f..267b893 100644 --- a/chrome/browser/cocoa/blocked_popup_container_controller.h +++ b/chrome/browser/cocoa/blocked_popup_container_controller.h @@ -26,7 +26,7 @@ scoped_ptr<BlockedPopupContainerView> bridge_; BlockedPopupContainer* container_; // Weak. "owns" me. scoped_nsobject<NSView> view_; - IBOutlet NSTextField* label_; + IBOutlet NSPopUpButton* popupButton_; } // Initialize with the given popup container. Creates the C++ bridge object @@ -45,8 +45,10 @@ @interface BlockedPopupContainerController(ForTesting) - (NSView*)view; -- (NSView*)label; +- (NSPopUpButton*)popupButton; - (IBAction)closePopup:(id)sender; +- (NSMenu*)buildMenu; +- (void)setContainer:(BlockedPopupContainer*)container; @end #endif // CHROME_BROWSER_VIEWS_BLOCKED_POPUP_CONTAINER_CONTROLLER_H_ |