diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 02:15:14 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 02:15:14 +0000 |
| commit | a321caa30af79adce28bfcf79607c42d279cc243 (patch) | |
| tree | c418a42398966868449e6ae535fce98ca7528af5 | |
| parent | 9376847646f2e97d4fde4f1836f40b48bb9012dc (diff) | |
| download | chromium_src-a321caa30af79adce28bfcf79607c42d279cc243.zip chromium_src-a321caa30af79adce28bfcf79607c42d279cc243.tar.gz chromium_src-a321caa30af79adce28bfcf79607c42d279cc243.tar.bz2 | |
Merge 45404 - [Mac] Fixed behavior of Sync Autofill checkbox in Customize Sync dialog
XIB changes: Switched on "Conditionally sets Hidden" flag for
autofill checkbox. Bound "Hidden" state to autofillRegistered with
NSNegateBoolean (which was incorrectly omitted).
BUG=41833
TEST=manual
Review URL: http://codereview.chromium.org/1700009
TBR=akalin@chromium.org
Review URL: http://codereview.chromium.org/1777001
git-svn-id: svn://svn.chromium.org/chrome/branches/375/src@45409 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/nibs/SyncCustomize.xib | 59 |
1 files changed, 36 insertions, 23 deletions
diff --git a/chrome/app/nibs/SyncCustomize.xib b/chrome/app/nibs/SyncCustomize.xib index 6406a4a..56b1605 100644 --- a/chrome/app/nibs/SyncCustomize.xib +++ b/chrome/app/nibs/SyncCustomize.xib @@ -3,7 +3,7 @@ <data> <int key="IBDocument.SystemTarget">1050</int> <string key="IBDocument.SystemVersion">9L31a</string> - <string key="IBDocument.InterfaceBuilderVersion">680</string> + <string key="IBDocument.InterfaceBuilderVersion">677</string> <string key="IBDocument.AppKitVersion">949.54</string> <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> @@ -317,26 +317,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: autofillPreferred</string> - <reference key="source" ref="903818124"/> - <reference key="destination" ref="1001"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="903818124"/> - <reference key="NSDestination" ref="1001"/> - <string key="NSLabel">value: autofillPreferred</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">autofillPreferred</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string> - <reference key="NS.object.0" ref="6"/> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">126</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> <string key="label">value: themesPreferred</string> <reference key="source" ref="425937350"/> <reference key="destination" ref="1001"/> @@ -453,6 +433,35 @@ </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> + <string key="label">value: autofillPreferred</string> + <reference key="source" ref="903818124"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="903818124"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">value: autofillPreferred</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">autofillPreferred</string> + <object class="NSDictionary" key="NSOptions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSAllowsEditingMultipleValuesSelection</string> + <string>NSConditionallySetsHidden</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="6"/> + <boolean value="YES"/> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">146</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> <string key="label">hidden: autofillRegistered</string> <reference key="source" ref="903818124"/> <reference key="destination" ref="1001"/> @@ -462,11 +471,15 @@ <string key="NSLabel">hidden: autofillRegistered</string> <string key="NSBinding">hidden</string> <string key="NSKeyPath">autofillRegistered</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSNegateBoolean</string> + </object> <reference key="NSPreviousConnector" ref="587129266"/> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">145</int> + <int key="connectionID">147</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -721,7 +734,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">145</int> + <int key="maxID">147</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> |