From be05905f3121b7ef622b184c27012107bc06c56e Mon Sep 17 00:00:00 2001 From: "pinkerton@chromium.org" Date: Mon, 6 Jul 2009 15:32:57 +0000 Subject: 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 --- chrome/browser/cocoa/blocked_popup_container_controller.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'chrome/browser/cocoa/blocked_popup_container_controller.h') 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 bridge_; BlockedPopupContainer* container_; // Weak. "owns" me. scoped_nsobject 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_ -- cgit v1.1