diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-22 01:53:41 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-22 01:53:41 +0000 |
| commit | ed1a45645a4cfb4fbcedd137d1eb3518aa4293b3 (patch) | |
| tree | a7aad6d30aa6e7246c132b34d8278c8da268b014 /chrome/chrome_browser.gypi | |
| parent | fa0785f362bf48d61d3f2c19f28804083e4e8e1c (diff) | |
| download | chromium_src-ed1a45645a4cfb4fbcedd137d1eb3518aa4293b3.zip chromium_src-ed1a45645a4cfb4fbcedd137d1eb3518aa4293b3.tar.gz chromium_src-ed1a45645a4cfb4fbcedd137d1eb3518aa4293b3.tar.bz2 | |
Mac: Move prefs around in preparation for the content settings window.
Also introduce scaffolding for the actual content settings dialog.
xib changes:
+ Personal stuff
* Move "Clear browsing data" button to under the hood tab
* Move themes stuff up a bit to cover hole left by missing button
+ under the hood:
* Created "Content Settings..." button
* Got rid of cookie settings
* Moved stuff around
+ clear data:
* Added horizontal rule and flash player settings link, linked its action to
new method.
+ content settings:
* Added mostly empty window that contains "This is not implemented yet" label and a button that shows cookies (since I removed that from the prefs, so that it's still available). This window will be fleshed out very soon (in my next CL).
* The window _is_ set up for l10n
+ bubble xibs:
* Enable "Manage" links now that they open a window
Four screenshots at http://imgur.com/axGiR&78O8g&wgk3p&6oOHj
BUG=34656,34894
TEST="Clear data" button has moved from "Personal Stuff" to "Under the hood" in prefs. There's a "Content Settings" button next to it that opens a mostly empty window. The "Clear data" dialog now has a link to flash's privacy settings (which hang if one has the AdThwart extension installed, heh).
Review URL: http://codereview.chromium.org/650124
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rwxr-xr-x | chrome/chrome_browser.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 04bd906..ef011ca 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -473,6 +473,8 @@ 'browser/cocoa/constrained_window_mac.mm', 'browser/cocoa/content_blocked_bubble_controller.h', 'browser/cocoa/content_blocked_bubble_controller.mm', + 'browser/cocoa/content_settings_dialog_controller.h', + 'browser/cocoa/content_settings_dialog_controller.mm', 'browser/cocoa/cookie_tree_node.h', 'browser/cocoa/cookie_tree_node.mm', 'browser/cocoa/cookies_window_controller.h', @@ -2358,6 +2360,7 @@ 'app/nibs/ContentBlockedJavaScript.xib', 'app/nibs/ContentBlockedPlugins.xib', 'app/nibs/ContentBlockedPopups.xib', + 'app/nibs/ContentSettings.xib', 'app/nibs/DownloadItem.xib', 'app/nibs/DownloadShelf.xib', 'app/nibs/EditSearchEngine.xib', |