Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3586)

Issue 650124: Mac: Move prefs around in preparation for the content settings window. (Closed)

Created:
10 years, 10 months ago by Nico
Modified:
9 years, 7 months ago
CC:
chromium-reviews_googlegroups.com
Visibility:
Public.

Description

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

Patch Set 1 #

Patch Set 2 : '' #

Patch Set 3 : scaffolding #

Patch Set 4 : done? #

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

Messages

Total messages: 4 (0 generated)
Nico
The list of touched files is pretty huge, but it's mostly 2-line changes. And lots ...
10 years, 10 months ago (2010-02-22 00:26:38 UTC) #1
Nico
Added a link to 4 screenshots to the description.
10 years, 10 months ago (2010-02-22 00:31:57 UTC) #2
viettrungluu
LGTM with nits. http://codereview.chromium.org/650124/diff/36/46 File chrome/browser/cocoa/browser_window_cocoa.mm (right): http://codereview.chromium.org/650124/diff/36/46#newcode14 chrome/browser/cocoa/browser_window_cocoa.mm:14: #include "chrome/browser/cocoa/browser_window_cocoa.h" #include first http://codereview.chromium.org/650124/diff/36/46#newcode321 chrome/browser/cocoa/browser_window_cocoa.mm:321: ...
10 years, 10 months ago (2010-02-22 00:57:39 UTC) #3
Nico
10 years, 10 months ago (2010-02-22 01:47:51 UTC) #4
Thanks.

I addressed all comments, but codereview currently times out for me,
so I can't add all these neat "Done." notes :-/

Submitting.

On Sun, Feb 21, 2010 at 4:57 PM,  <viettrungluu@chromium.org> wrote:
> LGTM with nits.
>
>
> http://codereview.chromium.org/650124/diff/36/46
> File chrome/browser/cocoa/browser_window_cocoa.mm (right):
>
> http://codereview.chromium.org/650124/diff/36/46#newcode14
> chrome/browser/cocoa/browser_window_cocoa.mm:14: #include
> "chrome/browser/cocoa/browser_window_cocoa.h"
> #include first
>
> http://codereview.chromium.org/650124/diff/36/46#newcode321
> chrome/browser/cocoa/browser_window_cocoa.mm:321: ContentSettingsType
> settingsType,
> Being a C++ method, C++ naming rules apply. So |settings_type|.
>
> http://codereview.chromium.org/650124/diff/36/48
> File chrome/browser/cocoa/clear_browsing_data_controller.mm (right):
>
> http://codereview.chromium.org/650124/diff/36/48#newcode165
> chrome/browser/cocoa/clear_browsing_data_controller.mm:165: Browser*
> browser = Browser::Create(profile_);
> Is this code common between platforms? Ought it not go somewhere common?
>
> http://codereview.chromium.org/650124/diff/36/50
> File chrome/browser/cocoa/content_blocked_bubble_controller_unittest.mm
> (right):
>
> http://codereview.chromium.org/650124/diff/36/50#newcode7
> chrome/browser/cocoa/content_blocked_bubble_controller_unittest.mm:7:
> #import "chrome/browser/cocoa/content_blocked_bubble_controller.h"
> Shouldn't this go before even the #import <Cocoa/Cocoa.h>? I've
> completely ignored the ordering for unit tests, mind you.
>
> http://codereview.chromium.org/650124/diff/36/52
> File chrome/browser/cocoa/content_settings_dialog_controller.mm (right):
>
> http://codereview.chromium.org/650124/diff/36/52#newcode7
> chrome/browser/cocoa/content_settings_dialog_controller.mm:7: #import
> "chrome/browser/cocoa/content_settings_dialog_controller.h"
> First, I say! First!
>
> http://codereview.chromium.org/650124/diff/36/52#newcode16
> chrome/browser/cocoa/content_settings_dialog_controller.mm:16: static
> ContentSettingsDialogController* g_instance = nil;
> We're mostly now putting stuff in anonymous namespaces. That way, when
> you add stuff, you won't have to change it.
>
> http://codereview.chromium.org/650124/diff/36/52#newcode40
> chrome/browser/cocoa/content_settings_dialog_controller.mm:40:
> g_instance->lastSelectedTab_.GetValue());
> You should validate that settingsType contains a valid value.
>
> http://codereview.chromium.org/650124/diff/36/52#newcode52
> chrome/browser/cocoa/content_settings_dialog_controller.mm:52: NSString*
> nibpath = [mac_util::MainAppBundle()
> I'd prefer it if you just broke the line after the '='.
>
> http://codereview.chromium.org/650124/diff/36/52#newcode72
> chrome/browser/cocoa/content_settings_dialog_controller.mm:72: // The
> controller will clean itself up.
> You should be a little clearer in what this means.
>
> http://codereview.chromium.org/650124/diff/36/55
> File chrome/browser/cocoa/preferences_window_controller.mm (right):
>
> http://codereview.chromium.org/650124/diff/36/55#newcode8
> chrome/browser/cocoa/preferences_window_controller.mm:8: #include
> "app/l10n_util.h"
> There should really be a blank line before this one.
>
> http://codereview.chromium.org/650124
>

Powered by Google App Engine
This is Rietveld 408576698