diff options
author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-07 17:48:35 +0000 |
---|---|---|
committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-07 17:48:35 +0000 |
commit | 1a5520603bc006aa0f73ef6762d2886b6719ee10 (patch) | |
tree | c3776255bdeccf0c761a91bbb173ac863f57c927 /chrome/app | |
parent | 7ea4f4bde37b1e2dd56762a8d30400af3016737e (diff) | |
download | chromium_src-1a5520603bc006aa0f73ef6762d2886b6719ee10.zip chromium_src-1a5520603bc006aa0f73ef6762d2886b6719ee10.tar.gz chromium_src-1a5520603bc006aa0f73ef6762d2886b6719ee10.tar.bz2 |
[Mac] Hook up the "Reset to Defaults" button in Under the Hood preferences.
BUG=45660
TEST=Chromium-->Preferences-->Under the Hood. Uncheck any one of the checkboxes. Click Reset to Defaults. Previous value gets restored.
Review URL: http://codereview.chromium.org/2702003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/generated_resources.grd | 31 | ||||
-rw-r--r-- | chrome/app/nibs/Preferences.xib | 86 |
2 files changed, 70 insertions, 47 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index e650405..14fa74c 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6422,15 +6422,28 @@ Keep your key file in a safe place. You will need it to create new versions of y Correct spelling automatically: </message> - <message name="IDS_OPTIONS_RESET" desc="The label of the 'Reset all settings to defaults' button"> - Reset to defaults - </message> - <message name="IDS_OPTIONS_RESET_OKLABEL" desc="The label of the OK button in the 'Reset Chrome options' confirmation dialog box"> - Reset to defaults - </message> - <message name="IDS_OPTIONS_RESET_CANCELLABEL" desc="The label of the Cancel button in the 'Reset Chrome options' confirmation dialog box"> - Don't reset - </message> + <if expr="not pp_ifdef('use_titlecase')"> + <message name="IDS_OPTIONS_RESET" desc="The label of the 'Reset all settings to defaults' button"> + Reset to defaults + </message> + <message name="IDS_OPTIONS_RESET_OKLABEL" desc="The label of the OK button in the 'Reset Chrome options' confirmation dialog box"> + Reset to defaults + </message> + <message name="IDS_OPTIONS_RESET_CANCELLABEL" desc="The label of the Cancel button in the 'Reset Chrome options' confirmation dialog box"> + Don't reset + </message> + </if> + <if expr="pp_ifdef('use_titlecase')"> + <message name="IDS_OPTIONS_RESET" desc="In Title Case: The label of the 'Reset all settings to defaults' button"> + Reset to Defaults + </message> + <message name="IDS_OPTIONS_RESET_OKLABEL" desc="In Title Case: The label of the OK button in the 'Reset Chrome options' confirmation dialog box"> + Reset to Defaults + </message> + <message name="IDS_OPTIONS_RESET_CANCELLABEL" desc="In Title Case: The label of the Cancel button in the 'Reset Chrome options' confirmation dialog box"> + Don't Reset + </message> + </if> <!-- General app failure messages --> <message name="IDS_COULDNT_OPEN_PROFILE_ERROR" desc="Error displayed on startup when the profile can not be opened correctly due to problems reading or writing files in it"> diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib index 2322f83..0f52326 100644 --- a/chrome/app/nibs/Preferences.xib +++ b/chrome/app/nibs/Preferences.xib @@ -8,11 +8,11 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="595"/> <integer value="481"/> - <integer value="482"/> - <integer value="74"/> <integer value="3"/> - <integer value="483"/> + <integer value="74"/> + <integer value="482"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -846,7 +846,7 @@ AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAPbWAAEAAAAA0y1hcHBs2U706y3Sst1fqit5+wYbUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAMSbmRpbgAA BOwAAAY+ZGVzYwAACywAAABkZHNjbQAAC5AAAAAubW1vZAAAC8AAAAAoY3BydAAAC+gAAAAtWFlaIAAA @@ -1406,7 +1406,7 @@ AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAPbWAAEAAAAA0y1hcHBs2U706y3Sst1fqit5+wYbUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAMSbmRpbgAA BOwAAAY+ZGVzYwAACywAAABkZHNjbQAAC5AAAAAubW1vZAAAC8AAAAAoY3BydAAAC+gAAAAtWFlaIAAA @@ -1845,7 +1845,7 @@ AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAPbWAAEAAAAA0y1hcHBs2U706y3Sst1fqit5+wYbUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAMSbmRpbgAA BOwAAAY+ZGVzYwAACywAAABkZHNjbQAAC5AAAAAubW1vZAAAC8AAAAAoY3BydAAAC+gAAAAtWFlaIAAA @@ -2182,7 +2182,7 @@ AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAPbWAAEAAAAA0y1hcHBs2U706y3Sst1fqit5+wYbUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAMSbmRpbgAA BOwAAAY+ZGVzYwAACywAAABkZHNjbQAAC5AAAAAubW1vZAAAC8AAAAAoY3BydAAAC+gAAAAtWFlaIAAA @@ -2464,7 +2464,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSSuperview" ref="926632778"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="319834642"> - <int key="NSCellFlags">604110336</int> + <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">^IDS_OPTIONS_RESET</string> <reference key="NSSupport" ref="445696277"/> @@ -3846,13 +3846,21 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <int key="connectionID">679</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">resetToDefaults:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="961419405"/> + </object> + <int key="connectionID">681</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBObjectRecord"> <int key="objectID">0</int> - <object class="NSArray" key="object" id="727124518"> + <object class="NSArray" key="object" id="476301154"> <bool key="EncodedWithXMLCoder">YES</bool> </object> <reference key="children" ref="1000"/> @@ -3861,19 +3869,19 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">-2</int> <reference key="object" ref="1001"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string> </object> <object class="IBObjectRecord"> <int key="objectID">-1</int> <reference key="object" ref="1003"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">First Responder</string> </object> <object class="IBObjectRecord"> <int key="objectID">-3</int> <reference key="object" ref="1004"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Application</string> </object> <object class="IBObjectRecord"> @@ -3884,7 +3892,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="408649839"/> <reference ref="530275816"/> </object> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> </object> <object class="IBObjectRecord"> <int key="objectID">4</int> @@ -3927,7 +3935,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="860741341"/> <reference ref="514356928"/> </object> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Under the Hood Content</string> </object> <object class="IBObjectRecord"> @@ -4129,7 +4137,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">380</int> <reference key="object" ref="495015235"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">CustomHomePages Array Controller</string> </object> <object class="IBObjectRecord"> @@ -4191,7 +4199,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">449</int> <reference key="object" ref="650617813"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> </object> <object class="IBObjectRecord"> <int key="objectID">476</int> @@ -4231,7 +4239,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="402804707"/> <reference ref="495791200"/> </object> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Basics View</string> </object> <object class="IBObjectRecord"> @@ -4256,7 +4264,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="175093092"/> <reference ref="423027085"/> </object> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Personal Stuff View</string> </object> <object class="IBObjectRecord"> @@ -4431,7 +4439,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="14278481"/> <reference ref="926632778"/> </object> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Under the Hood View</string> </object> <object class="IBObjectRecord"> @@ -4489,12 +4497,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">505</int> <reference key="object" ref="385419425"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> </object> <object class="IBObjectRecord"> <int key="objectID">510</int> <reference key="object" ref="305848829"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> </object> <object class="IBObjectRecord"> <int key="objectID">515</int> @@ -4843,61 +4851,61 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">528</int> <reference key="object" ref="145618054"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Basics Startup Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">529</int> <reference key="object" ref="843942020"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Basics Home Page Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">530</int> <reference key="object" ref="423189874"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Basics Toolbar Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">531</int> <reference key="object" ref="609957344"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Basics Search Engine Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">532</int> <reference key="object" ref="376486454"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Basics Default Browser Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">541</int> <reference key="object" ref="317778625"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Basics Startup Group Cont</string> </object> <object class="IBObjectRecord"> <int key="objectID">559</int> <reference key="object" ref="325031373"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Personal Stuff Passwords Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">560</int> <reference key="object" ref="683074852"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Personal Stuff Autofill Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">561</int> <reference key="object" ref="481147379"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Personal Stuff Browser Data Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">562</int> <reference key="object" ref="487772665"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Personal Stuff Themes Group</string> </object> <object class="IBObjectRecord"> @@ -4926,7 +4934,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">596</int> <reference key="object" ref="938815385"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> </object> <object class="IBObjectRecord"> <int key="objectID">601</int> @@ -4973,7 +4981,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">610</int> <reference key="object" ref="821768455"/> - <reference key="parent" ref="727124518"/> + <reference key="parent" ref="476301154"/> <string key="objectName">Personal Stuff Sync Group</string> </object> <object class="IBObjectRecord"> @@ -5410,14 +5418,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{812, 302}, {540, 468}}</string> + <string>{{555, 302}, {540, 468}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableArray"> <bool key="EncodedWithXMLCoder">YES</bool> </object> - <string>{{812, 448}, {540, 408}}</string> + <string>{{555, 448}, {540, 408}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{21, 136}, {540, 463}}</string> + <string>{{687, 393}, {540, 463}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{682, 562}, {616, 0}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5497,7 +5505,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{1061, 102}, {443, 754}}</string> + <string>{{652, 102}, {443, 754}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5537,7 +5545,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">679</int> + <int key="maxID">681</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -5722,6 +5730,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>removeSelectedHomepages:</string> <string>resetAutoOpenFiles:</string> <string>resetThemeToDefault:</string> + <string>resetToDefaults:</string> <string>showAutoFillSettings:</string> <string>showCertificates:</string> <string>showContentSettings:</string> @@ -5756,6 +5765,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> |