From 6f2c41a3bc45fc8ad62720ab45b9ea085eea74f4 Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Sun, 21 Feb 2010 16:59:19 +0000 Subject: Mac: Show content blocked bubbles. Two screenshots at http://imgur.com/5NDoC&pJJwP . xib changes: All 5 xibs contain a window of type InfoBubbleWindow with a custom InfoBubbleView. The view is connected to the controller's |bubble_| outlet. The controller is the window's |delegate|, and the window is the controller's |window|. The window is not visible at launch. It autorecalculates its key view loop. For the non-cookie xibs, the two buttons at the bottom are in GTMWidthBasedTweakers. Issues: * Clicking "blocked" icon with open bubble doesn't close the bubble BUG=35594,34894 TEST=Go to popuptest.com, start test. Click "Popups blocked" icon in omnibox. Bubble should appear. It should look sane in multiple locales (I tried English and German). The left button and the radio buttons are disabled at the moment, but the close button and the popup links should be functional. Review URL: http://codereview.chromium.org/650073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39581 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/chrome_browser.gypi | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'chrome/chrome_browser.gypi') diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 1cecec6..04bd906 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -471,6 +471,8 @@ 'browser/cocoa/command_observer_bridge.mm', 'browser/cocoa/constrained_window_mac.h', 'browser/cocoa/constrained_window_mac.mm', + 'browser/cocoa/content_blocked_bubble_controller.h', + 'browser/cocoa/content_blocked_bubble_controller.mm', 'browser/cocoa/cookie_tree_node.h', 'browser/cocoa/cookie_tree_node.mm', 'browser/cocoa/cookies_window_controller.h', @@ -2351,6 +2353,11 @@ 'app/nibs/BookmarkNameFolder.xib', 'app/nibs/ClearBrowsingData.xib', 'app/nibs/Cookies.xib', + 'app/nibs/ContentBlockedCookies.xib', + 'app/nibs/ContentBlockedImages.xib', + 'app/nibs/ContentBlockedJavaScript.xib', + 'app/nibs/ContentBlockedPlugins.xib', + 'app/nibs/ContentBlockedPopups.xib', 'app/nibs/DownloadItem.xib', 'app/nibs/DownloadShelf.xib', 'app/nibs/EditSearchEngine.xib', -- cgit v1.1