From 42f810552ed135af52a4d7c1ba3f3813ec7de51f Mon Sep 17 00:00:00 2001 From: "thomasvl@chromium.org" Date: Fri, 18 Sep 2009 13:01:46 +0000 Subject: Remove the theme popup menu and just have a reset button to match the other platforms. This avoids us needed extra localization strings, and we'll look to pick up any new UI when it's done for all platforms. Remove the autoseparating_menu since it is no longer used. TEST=Prefs just has a reset button and no theme popup list. BUG=none Review URL: http://codereview.chromium.org/214011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26560 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/nibs/Preferences.xib | 376 +++++++-------------- chrome/browser/cocoa/autoseparating_menu.h | 13 - chrome/browser/cocoa/autoseparating_menu.m | 26 -- .../browser/cocoa/preferences_window_controller.h | 5 +- .../browser/cocoa/preferences_window_controller.mm | 77 +---- chrome/chrome.gyp | 2 - 6 files changed, 131 insertions(+), 368 deletions(-) delete mode 100644 chrome/browser/cocoa/autoseparating_menu.h delete mode 100644 chrome/browser/cocoa/autoseparating_menu.m diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib index 7bf9390..e0e098c 100644 --- a/chrome/app/nibs/Preferences.xib +++ b/chrome/app/nibs/Preferences.xib @@ -1,18 +1,14 @@ - + 1050 - 10A432 - 732 - 1038 - 437.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 732 - + 9L30 + 677 + 949.54 + 353.00 YES - + YES @@ -20,7 +16,7 @@ YES - + YES @@ -46,7 +42,7 @@ Preferences NSWindow - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 256 @@ -62,7 +58,7 @@ 1 - + 256 YES @@ -78,7 +74,7 @@ Use Current LucidaGrande - 13 + 1.300000e+01 1044 @@ -150,7 +146,7 @@ Toolbar: LucidaGrande-Bold - 13 + 1.300000e+01 16 @@ -160,7 +156,7 @@ controlColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2OQA @@ -248,8 +244,8 @@ 0 Restore the pages that were open last - 1 + 1211912703 128 @@ -259,7 +255,7 @@ YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -285,7 +281,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -357,8 +353,8 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA 0 Open the following pages: - 2 + 1211912703 128 @@ -368,7 +364,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -394,7 +390,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAABEcAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAARHGFw cGwCAAAAbW50clJHQiBYWVogB9kAAgADABEABQAfYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsTYFxS94VjCFH/cYlpD4aTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -498,7 +494,7 @@ rwAAAAAAAAAAAAAAAAAAAAAAdGV4dAAAAABDb3B5cmlnaHQgQXBwbGUsIEluYy4sIDIwMDkAAYES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -524,7 +520,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA @@ -611,8 +607,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 0 Open this page: - 1 + 1211912703 128 @@ -622,7 +618,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -648,7 +644,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -731,7 +727,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -757,7 +753,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA @@ -878,16 +874,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - 279 - 40 - 1000 + 2.790000e+02 + 4.000000e+01 + 1.000000e+03 75628096 2048 LucidaGrande - 11 + 1.100000e+01 3100 @@ -921,8 +917,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 3 - 2 + 3.000000e+00 + 2.000000e+00 6 @@ -933,15 +929,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA MC41AA - 17 + 1.700000e+01 -901775360 - - 4 15 0 YES - 0 {{1, 1}, {282, 63}} @@ -959,7 +952,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 _doScroller: - 0.98684210000000006 + 9.868421e-01 @@ -969,7 +962,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 _doScroller: - 0.57142859999999995 + 5.714286e-01 {{171, 302}, {284, 65}} @@ -997,7 +990,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 129 LucidaGrande - 13 + 1.300000e+01 16 @@ -1018,7 +1011,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA Chromium is not the default browser. LucidaGrande - 11 + 1.100000e+01 16 @@ -1080,7 +1073,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{10, 33}, {513, 453}} - Basics @@ -1089,7 +1081,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 2 - + 256 YES @@ -1124,8 +1116,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 0 Offer to save passwords - 1 + 1211912703 128 @@ -1149,7 +1141,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1175,7 +1167,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -1258,7 +1250,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1284,7 +1276,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA @@ -1394,7 +1386,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 604110336 134217728 - Import Data… + SW1wb3J0IERhdGHigKY -2038284033 @@ -1414,7 +1406,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 67239424 134217728 - Clear Browsing Data… + Q2xlYXIgQnJvd3NpbmcgRGF0YeKApg -2038284033 @@ -1440,8 +1432,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 0 Save text from forms on web pages - 1 + 1211912703 128 @@ -1465,7 +1457,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1491,7 +1483,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -1574,7 +1566,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1600,7 +1592,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA @@ -1620,13 +1612,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{165, 82}, {129, 32}} + {{165, 83}, {129, 32}} YES 67239424 134217728 - Get Themes… + R2V0IFRoZW1lc+KApg -2038284033 @@ -1637,40 +1629,29 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 25 - + 268 - {{168, 119}, {206, 26}} + {{165, 115}, {183, 32}} YES - - -2076049856 - 2048 + + 67239424 + 134217728 + Reset to default theme - - 109199615 + + -2038284033 129 - 400 - 75 - - YES - - OtherViews - - YES - - - -1 - 1 - YES - YES - 2 + 200 + 25 {{10, 33}, {513, 453}} + Personal Stuff @@ -1716,8 +1697,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 _doScroller: - 1 - 0.9636363 + 1.000000e+00 + 9.636363e-01 @@ -1727,7 +1708,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 _doScroller: - 0.50602409999999998 + 5.060241e-01 {{17, 64}, {479, 386}} @@ -1766,14 +1747,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - + 0 YES YES YES - + @@ -1781,7 +1762,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{0, 0}, {1440, 878}} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} @@ -1830,7 +1811,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 67239424 272629760 - If you have chosen to open certain file types automatically after downloading, you can clear these settings so that downloaded files don't open automatically. + SWYgeW91IGhhdmUgY2hvc2VuIHRvIG9wZW4gY2VydGFpbiBmaWxlIHR5cGVzIGF1dG9tYXRpY2FsbHkg +YWZ0ZXIgZG93bmxvYWRpbmcsIHlvdSBjYW4gY2xlYXIgdGhlc2Ugc2V0dGluZ3Mgc28gdGhhdCBkb3du +bG9hZGVkIGZpbGVzIGRvbid0IG9wZW4gYXV0b21hdGljYWxseS4 @@ -1846,7 +1829,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 67239424 272629760 - The following web services may be used to improve your browsing experience — you may optionally disable these services. + VGhlIGZvbGxvd2luZyB3ZWIgc2VydmljZXMgbWF5IGJlIHVzZWQgdG8gaW1wcm92ZSB5b3VyIGJyb3dz +aW5nIGV4cGVyaWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2Vz +Lg @@ -2076,7 +2061,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 604110336 134217728 - Show Cookies… + U2hvdyBDb29raWVz4oCmA -2038284033 @@ -2239,7 +2224,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 YES - + YES Apple URL pasteboard type NSFilenamesPboardType @@ -2291,7 +2276,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 604110336 134217728 - Change Font and Language Settings… + Q2hhbmdlIEZvbnQgYW5kIExhbmd1YWdlIFNldHRpbmdz4oCmA -2038284033 @@ -2554,7 +2539,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA defaultBrowserText NSAllowsEditingMultipleValuesSelection - + 2 @@ -2598,7 +2583,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA passwordManagerEnabledIndex NSAllowsEditingMultipleValuesSelection - + 2 @@ -2618,7 +2603,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA formAutofillEnabledIndex NSAllowsEditingMultipleValuesSelection - + 2 @@ -2899,39 +2884,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 459 - - contentValues: availableThemes - - - - - - contentValues: availableThemes - contentValues - availableThemes - 2 - - - 468 - - - - selectedIndex: currentTheme - - - - - - selectedIndex: currentTheme - selectedIndex - currentTheme - - 2 - - - 470 - - manageSearchEngines: @@ -2939,32 +2891,42 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 471 + + + resetThemeToDefault: + + + + 474 + YES 0 - + + YES + -2 - - File's Owner + + RmlsZSdzIE93bmVyA -1 - + First Responder -3 - + Application @@ -2974,7 +2936,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + 4 @@ -3048,8 +3010,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + - @@ -3332,7 +3294,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - + Under The Hood @@ -3916,7 +3878,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 358 - + 362 @@ -3947,7 +3909,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 380 - + CustomHomePages Array Controller @@ -4041,7 +4003,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 449 - + 457 @@ -4058,36 +4020,24 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 460 - + 472 + YES - + - 461 - - - YES - - - - - - 462 - - - YES - - + 473 + + YES - + YES -1.IBPluginDependency -2.IBPluginDependency @@ -4196,12 +4146,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 45.IBPluginDependency 457.IBPluginDependency 458.IBPluginDependency - 460.IBPluginDependency - 461.IBPluginDependency - 462.CustomClassName - 462.IBEditorWindowLastContentRect - 462.IBPluginDependency 47.IBPluginDependency + 472.IBPluginDependency + 473.IBPluginDependency 48.IBPluginDependency 49.IBPluginDependency 5.IBPluginDependency @@ -4310,9 +4257,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{569, 323}, {559, 515}} - {{569, 323}, {559, 515}} - + {{784, 543}, {559, 515}} + {{784, 543}, {559, 515}} + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4360,9 +4307,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - AutoseparatingMenu - {{240, 157}, {190, 6}} - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4414,7 +4358,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + + YES + YES @@ -4422,31 +4368,25 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + + YES + YES - 471 + 474 YES - AutoseparatingMenu - NSMenu - - IBProjectSource - browser/cocoa/autoseparating_menu.h - - - GTMUILocalizer NSObject YES - + YES otherObjectToLocalize_ owner_ @@ -4491,62 +4431,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSWindowController YES - - YES - addHomepage: - clearData: - importData: - makeDefaultBrowser: - removeSelectedHomepages: - showPreferences: - showSavedPasswords: - themesGallery: - useCurrentPagesAsHomepage: - - - YES - id - id - id - id - id - id - id - id - id - - - - YES - - YES - advancedScroller_ - advancedView_ - customPagesArrayController_ - tabView_ - - - YES - NSScrollView - NSView - NSArrayController - NSTabView - - - - IBProjectSource - browser/cocoa/preferences_window_controller.h - - - - - YES - - PreferencesWindowController - NSWindowController - - YES - + YES addHomepage: clearData: @@ -4554,6 +4439,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA makeDefaultBrowser: manageSearchEngines: removeSelectedHomepages: + resetThemeToDefault: showPreferences: showSavedPasswords: themesGallery: @@ -4571,11 +4457,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA id id id + id YES - + YES advancedScroller_ advancedView_ @@ -4591,22 +4478,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - IBDocumentRelativeSource - ../../browser/cocoa/preferences_window_controller.h + IBProjectSource + browser/cocoa/preferences_window_controller.h 0 - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES ../../chrome.xcodeproj 3 diff --git a/chrome/browser/cocoa/autoseparating_menu.h b/chrome/browser/cocoa/autoseparating_menu.h deleted file mode 100644 index c350561..0000000 --- a/chrome/browser/cocoa/autoseparating_menu.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#import - -// By default, NSPopUpButton doesn't allow separator items in its menus. This is -// an NSMenu subclass that automatically adds separator items when presented -// with a @"-" string, so it can be set up in the nib to be the menu class. -@interface AutoseparatingMenu : NSMenu { -} - -@end diff --git a/chrome/browser/cocoa/autoseparating_menu.m b/chrome/browser/cocoa/autoseparating_menu.m deleted file mode 100644 index e0f36a7..0000000 --- a/chrome/browser/cocoa/autoseparating_menu.m +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#import "chrome/browser/cocoa/autoseparating_menu.h" - -@implementation AutoseparatingMenu - -- (NSMenuItem *)insertItemWithTitle:(NSString *)aString - action:(SEL)aSelector - keyEquivalent:(NSString *)keyEquiv - atIndex:(NSInteger)index { - if ([aString isEqualToString:@"-"]) { - NSMenuItem* separator = [NSMenuItem separatorItem]; - [self insertItem:separator - atIndex:index]; - return separator; - } else { - return [super insertItemWithTitle:aString - action:aSelector - keyEquivalent:keyEquiv - atIndex:index]; - } -} - -@end diff --git a/chrome/browser/cocoa/preferences_window_controller.h b/chrome/browser/cocoa/preferences_window_controller.h index 2e9ed7f..7b333ee 100644 --- a/chrome/browser/cocoa/preferences_window_controller.h +++ b/chrome/browser/cocoa/preferences_window_controller.h @@ -48,8 +48,6 @@ class Profile; // User Data panel BooleanPrefMember askSavePasswords_; BooleanPrefMember formAutofill_; - scoped_nsobject themeIds_; - int themeMenuOffset_; // Under the hood panel IBOutlet NSView* advancedView_; @@ -81,8 +79,7 @@ class Profile; - (IBAction)showSavedPasswords:(id)sender; - (IBAction)importData:(id)sender; - (IBAction)clearData:(id)sender; -- (NSArray*)availableThemes; -@property int currentTheme; +- (IBAction)resetThemeToDefault:(id)sender; - (IBAction)themesGallery:(id)sender; // Usable from cocoa bindings to hook up the custom home pages table. diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index e5146bd..26a82bb 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -641,80 +641,9 @@ const int kDisabledIndex = 1; [controller runModalDialog]; } -- (NSArray*)availableThemes { - const ExtensionList* extensions = - profile_->GetExtensionsService()->extensions(); - - NSMutableArray* themes = [NSMutableArray array]; - - for (size_t i = 0; i < extensions->size(); ++i) { - Extension* extension = extensions->at(i); - if (!extension->IsTheme()) - continue; - - NSDictionary* theme = - [NSDictionary dictionaryWithObjectsAndKeys: - [NSString stringWithUTF8String:extension->name().c_str()], @"name", - [NSString stringWithUTF8String:extension->id().c_str()], @"id", - nil]; - [themes addObject:theme]; - } - - NSSortDescriptor* sortDescriptor = - [[[NSSortDescriptor alloc] initWithKey:@"name" - ascending:YES - selector:@selector(localizedCompare:)] - autorelease]; - - [themes sortUsingDescriptors:[NSArray arrayWithObject:sortDescriptor]]; - - NSMutableArray* themeNames = [NSMutableArray array]; - NSMutableArray* themeIds = [NSMutableArray array]; - - for (NSDictionary* themeDict in themes) { - [themeNames addObject:[themeDict objectForKey:@"name"]]; - [themeIds addObject:[themeDict objectForKey:@"id"]]; - } - - themeMenuOffset_ = 0; - if ([themeNames count] > 0) { - [themeNames insertObject:@"-" atIndex:0]; - ++themeMenuOffset_; - } - NSString* defaultLabel = - [NSString stringWithUTF8String: - l10n_util::GetStringUTF8(IDS_THEMES_DEFAULT_THEME_LABEL).c_str()]; - [themeNames insertObject:defaultLabel atIndex:0]; - ++themeMenuOffset_; - - themeIds_.reset([themeIds retain]); - return themeNames; -} - -- (int)currentTheme { - const Extension* theme = profile_->GetTheme(); - - if (theme) { - NSString* themeId = [NSString stringWithUTF8String:theme->id().c_str()]; - return [themeIds_.get() indexOfObject:themeId] + themeMenuOffset_; - } - - return 0; -} - -- (void)setCurrentTheme:(int)newTheme { - newTheme -= themeMenuOffset_; - - if (newTheme < 0) { - [self recordUserAction:L"Options_ThemesReset"]; - profile_->ClearTheme(); - } else { - NSString* themeId = [themeIds_.get() objectAtIndex:newTheme]; - Extension* extension = - profile_->GetExtensionsService()-> - GetExtensionById([themeId UTF8String]); - profile_->SetTheme(extension); - } +- (IBAction)resetThemeToDefault:(id)sender { + [self recordUserAction:L"Options_ThemesReset"]; + profile_->ClearTheme(); } - (IBAction)themesGallery:(id)sender { diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index b9167b2..227cd39 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -862,8 +862,6 @@ 'browser/cocoa/autocomplete_text_field_cell.mm', 'browser/cocoa/autocomplete_text_field_editor.h', 'browser/cocoa/autocomplete_text_field_editor.mm', - 'browser/cocoa/autoseparating_menu.h', - 'browser/cocoa/autoseparating_menu.m', 'browser/cocoa/back_forward_menu_controller.h', 'browser/cocoa/back_forward_menu_controller.mm', 'browser/cocoa/background_gradient_view.h', -- cgit v1.1