|
|
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).
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=39588
Total comments: 10
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+921 lines, -404 lines) |
Patch |
 |
M |
chrome/app/generated_resources.grd
|
View
|
|
1 chunk |
+0 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/app/nibs/ClearBrowsingData.xib
|
View
|
|
19 chunks |
+138 lines, -15 lines |
0 comments
|
Download
|
 |
M |
chrome/app/nibs/ContentBlockedCookies.xib
|
View
|
|
3 chunks |
+2 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/app/nibs/ContentBlockedImages.xib
|
View
|
|
3 chunks |
+2 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/app/nibs/ContentBlockedJavaScript.xib
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/app/nibs/ContentBlockedPlugins.xib
|
View
|
|
2 chunks |
+1 line, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/app/nibs/ContentBlockedPopups.xib
|
View
|
|
3 chunks |
+3 lines, -4 lines |
0 comments
|
Download
|
 |
A |
chrome/app/nibs/ContentSettings.xib
|
View
|
2
3
|
1 chunk |
+405 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/app/nibs/Preferences.xib
|
View
|
|
50 chunks |
+151 lines, -319 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/cocoa/browser_window_cocoa.mm
|
View
|
1
2
3
|
2 chunks |
+5 lines, -3 lines |
2 comments
|
Download
|
 |
M |
chrome/browser/cocoa/clear_browsing_data_controller.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/cocoa/clear_browsing_data_controller.mm
|
View
|
|
2 chunks |
+16 lines, -0 lines |
1 comment
|
Download
|
 |
M |
chrome/browser/cocoa/content_blocked_bubble_controller.mm
|
View
|
1
2
3
|
2 chunks |
+9 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/cocoa/content_blocked_bubble_controller_unittest.mm
|
View
|
|
1 chunk |
+2 lines, -1 line |
1 comment
|
Download
|
 |
A |
chrome/browser/cocoa/content_settings_dialog_controller.h
|
View
|
2
3
|
1 chunk |
+31 lines, -0 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/cocoa/content_settings_dialog_controller.mm
|
View
|
2
3
|
1 chunk |
+84 lines, -0 lines |
5 comments
|
Download
|
 |
A |
chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm
|
View
|
2
3
|
1 chunk |
+31 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/cocoa/preferences_window_controller.h
|
View
|
|
3 chunks |
+4 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/cocoa/preferences_window_controller.mm
|
View
|
1
2
3
|
11 chunks |
+29 lines, -39 lines |
1 comment
|
Download
|
 |
M |
chrome/chrome_browser.gypi
|
View
|
|
2 chunks |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/chrome_dll.gypi
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/chrome_tests.gypi
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
Total messages: 4 (0 generated)
|