summaryrefslogtreecommitdiffstats
path: root/chrome/app/nibs
diff options
context:
space:
mode:
authordhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-23 22:47:42 +0000
committerdhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-23 22:47:42 +0000
commit74262ecb34f2b2fa1cf20802138a23f31a181e44 (patch)
tree450fa3da797b5141fbdddd28bab608dc487b844e /chrome/app/nibs
parentfd11f1752b5296b7f640616193ae3663802e0736 (diff)
downloadchromium_src-74262ecb34f2b2fa1cf20802138a23f31a181e44.zip
chromium_src-74262ecb34f2b2fa1cf20802138a23f31a181e44.tar.gz
chromium_src-74262ecb34f2b2fa1cf20802138a23f31a181e44.tar.bz2
These changes connect the AutoFill UI on the Mac with the back-end data store. Changes to a user's address and credit card information are now persisted. Other changes are:
- Selectively disables the preferences "Setup autofill..." button when the PersonalDataManager is not available. - Allows the user to add or remove address or credit card entries in the AutoFill dialog. - The billing and shipping popup menus in the credit card entries now properly reflect the list of addresses. Notes on nib changes: - AutoFillAddressFormView.xib : added Delete button, wired to trigger |deleteAddress:| action. - AutoFillDialog.xib changed window size to encompass new controls. Added "Add Address" and "Add Credit Card" buttons. Wired them up to |addNewAddress:| and |addNewCreditCard:| actions, respectively. - Preferences.xib : |autoFillSettingsButton_| outlet wired up to facilitate disabling when no |PersonalDataManager| is available. - AutoFillCreditCardFormView.xib : added "Delete" button and wired up to |deleteCreditCard:| action. Removed outlets to menus that were only there for temporary disablement reasons. Set up bindings for billing and shipping address menu items and for their selected item. BUG=33029 TEST=unit_tests --gtest_filter=AutoFillDialogControllerTest.* Note new: Google Test filter = AutoFillDialogControllerTest.*:AutoFillAddressModelTest.*:AutoFillAddressViewControllerTest.*:AutoFillCreditCardModelTest.*:AutoFillCreditCardViewControllerTest.*:DisclosureViewControllerTest.*:SectionSeparatorViewTest.*:VerticalLayoutViewTest.* Review URL: http://codereview.chromium.org/650163 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39787 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs')
-rw-r--r--chrome/app/nibs/AutoFillAddressFormView.xib133
-rw-r--r--chrome/app/nibs/AutoFillCreditCardFormView.xib206
-rw-r--r--chrome/app/nibs/AutoFillDialog.xib126
-rw-r--r--chrome/app/nibs/Preferences.xib26
4 files changed, 388 insertions, 103 deletions
diff --git a/chrome/app/nibs/AutoFillAddressFormView.xib b/chrome/app/nibs/AutoFillAddressFormView.xib
index cd81344..f0fad15 100644
--- a/chrome/app/nibs/AutoFillAddressFormView.xib
+++ b/chrome/app/nibs/AutoFillAddressFormView.xib
@@ -48,7 +48,7 @@
<object class="NSButton" id="347358645">
<reference key="NSNextResponder" ref="122985017"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{3, 386}, {13, 13}}</string>
+ <string key="NSFrame">{{3, 415}, {13, 13}}</string>
<reference key="NSSuperview" ref="122985017"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="872433556">
@@ -72,7 +72,7 @@
<object class="NSTextField" id="102078487">
<reference key="NSNextResponder" ref="122985017"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{21, 385}, {143, 14}}</string>
+ <string key="NSFrame">{{21, 414}, {143, 14}}</string>
<reference key="NSSuperview" ref="122985017"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="341471168">
@@ -108,7 +108,7 @@
<object class="NSTextField" id="959519786">
<reference key="NSNextResponder" ref="122985017"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{181, 385}, {307, 14}}</string>
+ <string key="NSFrame">{{181, 414}, {307, 14}}</string>
<reference key="NSSuperview" ref="122985017"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="455213863">
@@ -140,7 +140,7 @@
<object class="NSTextField" id="146416385">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{175, 246}, {153, 14}}</string>
+ <string key="NSFrame">{{175, 277}, {153, 14}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1059452929">
@@ -156,7 +156,7 @@
<object class="NSTextField" id="545163170">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 317}, {134, 22}}</string>
+ <string key="NSFrame">{{18, 348}, {134, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="579219650">
@@ -186,7 +186,7 @@
<object class="NSTextField" id="296311198">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 219}, {134, 22}}</string>
+ <string key="NSFrame">{{18, 250}, {134, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="206849323">
@@ -203,7 +203,7 @@
<object class="NSTextField" id="816149117">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{330, 295}, {126, 14}}</string>
+ <string key="NSFrame">{{330, 326}, {126, 14}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="627891103">
@@ -219,7 +219,7 @@
<object class="NSTextField" id="874857332">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{391, 72}, {76, 22}}</string>
+ <string key="NSFrame">{{391, 103}, {76, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="507664817">
@@ -236,7 +236,7 @@
<object class="NSTextField" id="577710194">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 99}, {126, 14}}</string>
+ <string key="NSFrame">{{15, 130}, {126, 14}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="765480465">
@@ -252,7 +252,7 @@
<object class="NSTextField" id="466701443">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 344}, {126, 14}}</string>
+ <string key="NSFrame">{{15, 375}, {126, 14}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="296998643">
@@ -268,7 +268,7 @@
<object class="NSTextField" id="899454944">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 121}, {294, 22}}</string>
+ <string key="NSFrame">{{18, 152}, {294, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="444912714">
@@ -285,7 +285,7 @@
<object class="NSTextField" id="610102465">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 246}, {153, 14}}</string>
+ <string key="NSFrame">{{15, 277}, {153, 14}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="307912629">
@@ -301,7 +301,7 @@
<object class="NSTextField" id="91651004">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 170}, {294, 22}}</string>
+ <string key="NSFrame">{{18, 201}, {294, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="754981047">
@@ -318,7 +318,7 @@
<object class="NSTextField" id="357318770">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 72}, {134, 22}}</string>
+ <string key="NSFrame">{{18, 103}, {134, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="863092623">
@@ -335,7 +335,7 @@
<object class="NSTextField" id="181252802">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{333, 72}, {50, 22}}</string>
+ <string key="NSFrame">{{333, 103}, {50, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="662916459">
@@ -352,7 +352,7 @@
<object class="NSTextField" id="10502416">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 148}, {153, 14}}</string>
+ <string key="NSFrame">{{15, 179}, {153, 14}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1037381502">
@@ -368,7 +368,7 @@
<object class="NSTextField" id="284349572">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 295}, {153, 14}}</string>
+ <string key="NSFrame">{{15, 326}, {153, 14}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="571336836">
@@ -384,7 +384,7 @@
<object class="NSTextField" id="1016152685">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{333, 268}, {134, 22}}</string>
+ <string key="NSFrame">{{333, 299}, {134, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="370489450">
@@ -401,7 +401,7 @@
<object class="NSTextField" id="769271941">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{178, 219}, {134, 22}}</string>
+ <string key="NSFrame">{{178, 250}, {134, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="604222827">
@@ -418,7 +418,7 @@
<object class="NSTextField" id="833736226">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 50}, {213, 14}}</string>
+ <string key="NSFrame">{{15, 81}, {213, 14}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="978954508">
@@ -434,7 +434,7 @@
<object class="NSTextField" id="433159674">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 197}, {153, 14}}</string>
+ <string key="NSFrame">{{15, 228}, {153, 14}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="353262710">
@@ -450,7 +450,7 @@
<object class="NSTextField" id="848642703">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{108, 23}, {117, 22}}</string>
+ <string key="NSFrame">{{108, 54}, {117, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="111342920">
@@ -467,7 +467,7 @@
<object class="NSTextField" id="289669180">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{178, 268}, {134, 22}}</string>
+ <string key="NSFrame">{{178, 299}, {134, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="160226063">
@@ -484,7 +484,7 @@
<object class="NSTextField" id="557852134">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 23}, {34, 22}}</string>
+ <string key="NSFrame">{{18, 54}, {34, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="31526252">
@@ -501,7 +501,7 @@
<object class="NSTextField" id="23131512">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{60, 23}, {40, 22}}</string>
+ <string key="NSFrame">{{60, 54}, {40, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="463062819">
@@ -518,7 +518,7 @@
<object class="NSTextField" id="873535292">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{260, 23}, {34, 22}}</string>
+ <string key="NSFrame">{{260, 54}, {34, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="486193331">
@@ -535,7 +535,7 @@
<object class="NSTextField" id="714038373">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{178, 72}, {134, 22}}</string>
+ <string key="NSFrame">{{178, 103}, {134, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="49057410">
@@ -552,7 +552,7 @@
<object class="NSTextField" id="181356333">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{332, 99}, {56, 14}}</string>
+ <string key="NSFrame">{{332, 130}, {56, 14}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="326415012">
@@ -568,7 +568,7 @@
<object class="NSTextField" id="316039049">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{388, 99}, {79, 14}}</string>
+ <string key="NSFrame">{{388, 130}, {79, 14}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="230410745">
@@ -584,7 +584,7 @@
<object class="NSTextField" id="942868838">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{257, 50}, {213, 14}}</string>
+ <string key="NSFrame">{{257, 81}, {213, 14}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="425284459">
@@ -600,7 +600,7 @@
<object class="NSTextField" id="538615142">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{302, 23}, {40, 22}}</string>
+ <string key="NSFrame">{{302, 54}, {40, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="294409474">
@@ -617,7 +617,7 @@
<object class="NSTextField" id="537064214">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{175, 99}, {153, 14}}</string>
+ <string key="NSFrame">{{175, 130}, {153, 14}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1022619911">
@@ -633,7 +633,7 @@
<object class="NSTextField" id="731633316">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 268}, {134, 22}}</string>
+ <string key="NSFrame">{{18, 299}, {134, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="557583037">
@@ -650,7 +650,7 @@
<object class="NSTextField" id="467266453">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{175, 295}, {153, 14}}</string>
+ <string key="NSFrame">{{175, 326}, {153, 14}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="247507430">
@@ -666,7 +666,7 @@
<object class="NSTextField" id="115971484">
<reference key="NSNextResponder" ref="195575826"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{350, 23}, {117, 22}}</string>
+ <string key="NSFrame">{{350, 54}, {117, 22}}</string>
<reference key="NSSuperview" ref="195575826"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="285986798">
@@ -680,12 +680,32 @@
<reference key="NSTextColor" ref="21034430"/>
</object>
</object>
+ <object class="NSButton" id="164512976">
+ <reference key="NSNextResponder" ref="195575826"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{12, 6}, {96, 32}}</string>
+ <reference key="NSSuperview" ref="195575826"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="787258833">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">^IDS_AUTOFILL_DELETE_BUTTON</string>
+ <reference key="NSSupport" ref="872268129"/>
+ <reference key="NSControlView" ref="164512976"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
</object>
- <string key="NSFrame">{{1, 1}, {482, 368}}</string>
+ <string key="NSFrame">{{1, 1}, {482, 399}}</string>
<reference key="NSSuperview" ref="556992356"/>
</object>
</object>
- <string key="NSFrame">{{21, 9}, {484, 370}}</string>
+ <string key="NSFrame">{{21, 7}, {484, 401}}</string>
<reference key="NSSuperview" ref="122985017"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -706,11 +726,11 @@
<bool key="NSTransparent">NO</bool>
</object>
</object>
- <string key="NSFrameSize">{518, 400}</string>
+ <string key="NSFrameSize">{518, 429}</string>
<reference key="NSSuperview" ref="70311064"/>
</object>
</object>
- <string key="NSFrameSize">{518, 400}</string>
+ <string key="NSFrameSize">{518, 429}</string>
<reference key="NSSuperview"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1105,6 +1125,14 @@
</object>
<int key="connectionID">214</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">deleteAddress:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="164512976"/>
+ </object>
+ <int key="connectionID">217</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -1226,6 +1254,7 @@
<reference ref="731633316"/>
<reference ref="467266453"/>
<reference ref="115971484"/>
+ <reference ref="164512976"/>
</object>
<reference key="parent" ref="70311064"/>
</object>
@@ -1682,6 +1711,20 @@
<reference key="object" ref="606174174"/>
<reference key="parent" ref="1002"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">215</int>
+ <reference key="object" ref="164512976"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="787258833"/>
+ </object>
+ <reference key="parent" ref="556992356"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">216</int>
+ <reference key="object" ref="787258833"/>
+ <reference key="parent" ref="164512976"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1704,6 +1747,8 @@
<string>19.IBPluginDependency</string>
<string>20.IBPluginDependency</string>
<string>21.IBPluginDependency</string>
+ <string>215.IBPluginDependency</string>
+ <string>216.IBPluginDependency</string>
<string>22.CustomClassName</string>
<string>22.IBPluginDependency</string>
<string>23.IBPluginDependency</string>
@@ -1802,6 +1847,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>AutoFillTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1811,7 +1858,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{42, 1099}, {518, 400}}</string>
+ <string>{{42, 1070}, {518, 429}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1905,7 +1952,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">214</int>
+ <int key="maxID">217</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1913,6 +1960,10 @@
<object class="IBPartialClassDescription">
<string key="className">AutoFillAddressViewController</string>
<string key="superclassName">DisclosureViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">deleteAddress:</string>
+ <string key="NS.object.0">id</string>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">browser/autofill/autofill_address_view_controller_mac.h</string>
diff --git a/chrome/app/nibs/AutoFillCreditCardFormView.xib b/chrome/app/nibs/AutoFillCreditCardFormView.xib
index 97d23f3..d7be6ae 100644
--- a/chrome/app/nibs/AutoFillCreditCardFormView.xib
+++ b/chrome/app/nibs/AutoFillCreditCardFormView.xib
@@ -48,7 +48,7 @@
<object class="NSButton" id="347358645">
<reference key="NSNextResponder" ref="122985017"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{3, 275}, {13, 13}}</string>
+ <string key="NSFrame">{{3, 313}, {13, 13}}</string>
<reference key="NSSuperview" ref="122985017"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="872433556">
@@ -72,7 +72,7 @@
<object class="NSTextField" id="102078487">
<reference key="NSNextResponder" ref="122985017"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{21, 274}, {149, 14}}</string>
+ <string key="NSFrame">{{21, 312}, {149, 14}}</string>
<reference key="NSSuperview" ref="122985017"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="341471168">
@@ -108,7 +108,7 @@
<object class="NSTextField" id="959519786">
<reference key="NSNextResponder" ref="122985017"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{181, 274}, {310, 14}}</string>
+ <string key="NSFrame">{{181, 312}, {310, 14}}</string>
<reference key="NSSuperview" ref="122985017"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="455213863">
@@ -140,7 +140,7 @@
<object class="NSTextField" id="816149117">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{213, 135}, {96, 14}}</string>
+ <string key="NSFrame">{{213, 175}, {96, 14}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="627891103">
@@ -156,7 +156,7 @@
<object class="NSTextField" id="630595680">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{322, 108}, {37, 22}}</string>
+ <string key="NSFrame">{{322, 148}, {37, 22}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="515758525">
@@ -186,7 +186,7 @@
<object class="NSTextField" id="93866959">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{257, 108}, {53, 22}}</string>
+ <string key="NSFrame">{{257, 148}, {53, 22}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="220099529">
@@ -203,7 +203,7 @@
<object class="NSTextField" id="284349572">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 184}, {196, 14}}</string>
+ <string key="NSFrame">{{15, 224}, {196, 14}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="571336836">
@@ -219,7 +219,7 @@
<object class="NSTextField" id="1016152685">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{216, 108}, {37, 22}}</string>
+ <string key="NSFrame">{{216, 148}, {37, 22}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="370489450">
@@ -236,7 +236,7 @@
<object class="NSTextField" id="289669180">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 108}, {190, 22}}</string>
+ <string key="NSFrame">{{18, 148}, {190, 22}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="160226063">
@@ -253,7 +253,7 @@
<object class="NSPopUpButton" id="418154734">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 10}, {196, 26}}</string>
+ <string key="NSFrame">{{15, 50}, {196, 26}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="883534991">
@@ -324,7 +324,7 @@
<object class="NSTextField" id="55735488">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 86}, {153, 14}}</string>
+ <string key="NSFrame">{{15, 126}, {153, 14}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="293259553">
@@ -340,7 +340,7 @@
<object class="NSTextField" id="567463722">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{319, 135}, {43, 14}}</string>
+ <string key="NSFrame">{{319, 175}, {43, 14}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="835537491">
@@ -356,7 +356,7 @@
<object class="NSTextField" id="466701443">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 233}, {140, 14}}</string>
+ <string key="NSFrame">{{15, 273}, {140, 14}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="296998643">
@@ -372,7 +372,7 @@
<object class="NSPopUpButton" id="329875611">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 59}, {196, 26}}</string>
+ <string key="NSFrame">{{15, 99}, {196, 26}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="770068771">
@@ -437,7 +437,7 @@
<object class="NSTextField" id="1014098534">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 37}, {153, 14}}</string>
+ <string key="NSFrame">{{15, 77}, {153, 14}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="793669905">
@@ -453,7 +453,7 @@
<object class="NSTextField" id="545163170">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 206}, {134, 22}}</string>
+ <string key="NSFrame">{{18, 246}, {134, 22}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="579219650">
@@ -470,7 +470,7 @@
<object class="NSTextField" id="467266453">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 135}, {185, 14}}</string>
+ <string key="NSFrame">{{15, 175}, {185, 14}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="247507430">
@@ -486,7 +486,7 @@
<object class="NSTextField" id="731633316">
<reference key="NSNextResponder" ref="1034866434"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 157}, {190, 22}}</string>
+ <string key="NSFrame">{{18, 197}, {190, 22}}</string>
<reference key="NSSuperview" ref="1034866434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="557583037">
@@ -500,12 +500,32 @@
<reference key="NSTextColor" ref="21034430"/>
</object>
</object>
+ <object class="NSButton" id="415706256">
+ <reference key="NSNextResponder" ref="1034866434"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{12, 6}, {96, 32}}</string>
+ <reference key="NSSuperview" ref="1034866434"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="134376308">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">^IDS_AUTOFILL_DELETE_BUTTON</string>
+ <reference key="NSSupport" ref="872268129"/>
+ <reference key="NSControlView" ref="415706256"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
</object>
- <string key="NSFrame">{{1, 1}, {482, 257}}</string>
+ <string key="NSFrame">{{1, 1}, {482, 297}}</string>
<reference key="NSSuperview" ref="436522406"/>
</object>
</object>
- <string key="NSFrame">{{21, 9}, {484, 259}}</string>
+ <string key="NSFrame">{{21, 7}, {484, 299}}</string>
<reference key="NSSuperview" ref="122985017"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -526,11 +546,11 @@
<bool key="NSTransparent">NO</bool>
</object>
</object>
- <string key="NSFrameSize">{518, 289}</string>
+ <string key="NSFrameSize">{518, 327}</string>
<reference key="NSSuperview" ref="70311064"/>
</object>
</object>
- <string key="NSFrameSize">{518, 289}</string>
+ <string key="NSFrameSize">{518, 327}</string>
<reference key="NSSuperview"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -553,6 +573,9 @@
<object class="NSCustomObject" id="708631435">
<string key="NSClassName">ChromeUILocalizer</string>
</object>
+ <object class="NSUserDefaultsController" id="632393829">
+ <bool key="NSSharedInstance">YES</bool>
+ </object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
@@ -567,14 +590,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">billingAddressLabel_</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="55735488"/>
- </object>
- <int key="connectionID">150</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">billingAddressPopup_</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="329875611"/>
@@ -583,14 +598,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">shippingAddressLabel_</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="1014098534"/>
- </object>
- <int key="connectionID">155</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">shippingAddressPopup_</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="418154734"/>
@@ -765,6 +772,84 @@
</object>
<int key="connectionID">181</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">deleteCreditCard:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="415706256"/>
+ </object>
+ <int key="connectionID">184</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">contentValues: billingAddressContents</string>
+ <reference key="source" ref="329875611"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector" id="805081554">
+ <reference key="NSSource" ref="329875611"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">contentValues: billingAddressContents</string>
+ <string key="NSBinding">contentValues</string>
+ <string key="NSKeyPath">billingAddressContents</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">188</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">contentValues: shippingAddressContents</string>
+ <reference key="source" ref="418154734"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector" id="532787999">
+ <reference key="NSSource" ref="418154734"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">contentValues: shippingAddressContents</string>
+ <string key="NSBinding">contentValues</string>
+ <string key="NSKeyPath">shippingAddressContents</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">198</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">selectedValue: creditCardModel.shippingAddress</string>
+ <reference key="source" ref="418154734"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="418154734"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">selectedValue: creditCardModel.shippingAddress</string>
+ <string key="NSBinding">selectedValue</string>
+ <string key="NSKeyPath">creditCardModel.shippingAddress</string>
+ <reference key="NSPreviousConnector" ref="532787999"/>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">199</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">selectedValue: creditCardModel.billingAddress</string>
+ <reference key="source" ref="329875611"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="329875611"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">selectedValue: creditCardModel.billingAddress</string>
+ <string key="NSBinding">selectedValue</string>
+ <string key="NSKeyPath">creditCardModel.billingAddress</string>
+ <object class="NSDictionary" key="NSOptions">
+ <string key="NS.key.0">NSConditionallySetsEnabled</string>
+ <boolean value="NO" key="NS.object.0"/>
+ </object>
+ <reference key="NSPreviousConnector" ref="805081554"/>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">200</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -869,6 +954,7 @@
<reference ref="467266453"/>
<reference ref="731633316"/>
<reference ref="289669180"/>
+ <reference ref="415706256"/>
</object>
<reference key="parent" ref="70311064"/>
</object>
@@ -1147,6 +1233,25 @@
<reference key="object" ref="708631435"/>
<reference key="parent" ref="1002"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">182</int>
+ <reference key="object" ref="415706256"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="134376308"/>
+ </object>
+ <reference key="parent" ref="436522406"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">183</int>
+ <reference key="object" ref="134376308"/>
+ <reference key="parent" ref="415706256"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">185</int>
+ <reference key="object" ref="632393829"/>
+ <reference key="parent" ref="1002"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1178,6 +1283,8 @@
<string>17.IBPluginDependency</string>
<string>18.CustomClassName</string>
<string>18.IBPluginDependency</string>
+ <string>182.IBPluginDependency</string>
+ <string>183.IBPluginDependency</string>
<string>19.IBPluginDependency</string>
<string>20.IBPluginDependency</string>
<string>21.IBPluginDependency</string>
@@ -1241,6 +1348,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>AutoFillTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1250,7 +1359,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{42, 1210}, {518, 289}}</string>
+ <string>{{42, 1172}, {518, 327}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1294,7 +1403,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">181</int>
+ <int key="maxID">200</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1302,20 +1411,29 @@
<object class="IBPartialClassDescription">
<string key="className">AutoFillCreditCardViewController</string>
<string key="superclassName">DisclosureViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>deleteCreditCard:</string>
+ <string>onAddressesChanged:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>billingAddressLabel_</string>
<string>billingAddressPopup_</string>
- <string>shippingAddressLabel_</string>
<string>shippingAddressPopup_</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSTextField</string>
<string>NSPopUpButton</string>
- <string>NSTextField</string>
<string>NSPopUpButton</string>
</object>
</object>
diff --git a/chrome/app/nibs/AutoFillDialog.xib b/chrome/app/nibs/AutoFillDialog.xib
index d098f5d..3c455e1 100644
--- a/chrome/app/nibs/AutoFillDialog.xib
+++ b/chrome/app/nibs/AutoFillDialog.xib
@@ -8,7 +8,7 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="71"/>
+ <integer value="2"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -38,7 +38,7 @@
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">9</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{990, 893}, {570, 514}}</string>
+ <string key="NSWindowRect">{{990, 893}, {570, 544}}</string>
<int key="NSWTFlags">538968064</int>
<string key="NSWindowTitle">Autofill profiles</string>
<string key="NSWindowClass">NSWindow</string>
@@ -119,6 +119,26 @@
<reference key="NSSuperview" ref="872997946"/>
<string key="NSClassName">NSView</string>
</object>
+ <object class="NSButton" id="479761609">
+ <reference key="NSNextResponder" ref="872997946"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{5, 316}, {157, 32}}</string>
+ <reference key="NSSuperview" ref="872997946"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="718926501">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">^IDS_AUTOFILL_ADD_ADDRESS_BUTTON</string>
+ <reference key="NSSupport" ref="47060168"/>
+ <reference key="NSControlView" ref="479761609"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
<object class="NSBox" id="141888078">
<reference key="NSNextResponder" ref="872997946"/>
<int key="NSvFlags">12</int>
@@ -203,13 +223,33 @@
<reference key="NSSuperview" ref="872997946"/>
<string key="NSClassName">NSView</string>
</object>
+ <object class="NSButton" id="505889340">
+ <reference key="NSNextResponder" ref="872997946"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{9, 220}, {153, 32}}</string>
+ <reference key="NSSuperview" ref="872997946"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="350407933">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">^IDS_AUTOFILL_ADD_CREDITCARD_BUTTON</string>
+ <reference key="NSSupport" ref="47060168"/>
+ <reference key="NSControlView" ref="505889340"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
</object>
- <string key="NSFrameSize">{528, 433}</string>
+ <string key="NSFrameSize">{528, 463}</string>
<reference key="NSSuperview" ref="412667745"/>
<string key="NSClassName">VerticalLayoutView</string>
</object>
</object>
- <string key="NSFrame">{{1, 1}, {528, 433}}</string>
+ <string key="NSFrame">{{1, 1}, {528, 463}}</string>
<reference key="NSSuperview" ref="850198595"/>
<reference key="NSNextKeyView" ref="872997946"/>
<reference key="NSDocView" ref="872997946"/>
@@ -241,7 +281,7 @@
<double key="NSPercent">5.060241e-01</double>
</object>
</object>
- <string key="NSFrame">{{20, 60}, {530, 435}}</string>
+ <string key="NSFrame">{{20, 60}, {530, 465}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSNextKeyView" ref="412667745"/>
<int key="NSsFlags">530</int>
@@ -252,7 +292,7 @@
<object class="NSButton" id="589566927">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{460, 12}, {96, 32}}</string>
+ <string key="NSFrame">{{364, 12}, {96, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="7810365">
@@ -272,7 +312,7 @@
<object class="NSButton" id="152555007">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{364, 12}, {96, 32}}</string>
+ <string key="NSFrame">{{460, 12}, {96, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="656277902">
@@ -290,7 +330,7 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{570, 514}</string>
+ <string key="NSFrameSize">{570, 544}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {2560, 1578}}</string>
@@ -384,6 +424,22 @@
</object>
<int key="connectionID">83</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">addNewAddress:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="479761609"/>
+ </object>
+ <int key="connectionID">88</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">addNewCreditCard:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="505889340"/>
+ </object>
+ <int key="connectionID">89</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -429,8 +485,8 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="850198595"/>
- <reference ref="589566927"/>
<reference ref="152555007"/>
+ <reference ref="589566927"/>
</object>
<reference key="parent" ref="1005"/>
</object>
@@ -477,6 +533,8 @@
<reference ref="141888078"/>
<reference ref="294722067"/>
<reference ref="79325094"/>
+ <reference ref="505889340"/>
+ <reference ref="479761609"/>
</object>
<reference key="parent" ref="850198595"/>
</object>
@@ -571,6 +629,34 @@
<reference key="object" ref="429712482"/>
<reference key="parent" ref="1002"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">84</int>
+ <reference key="object" ref="479761609"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="718926501"/>
+ </object>
+ <reference key="parent" ref="872997946"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">85</int>
+ <reference key="object" ref="718926501"/>
+ <reference key="parent" ref="479761609"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">86</int>
+ <reference key="object" ref="505889340"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="350407933"/>
+ </object>
+ <reference key="parent" ref="872997946"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">87</int>
+ <reference key="object" ref="350407933"/>
+ <reference key="parent" ref="505889340"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -606,15 +692,19 @@
<string>71.IBPluginDependency</string>
<string>72.IBPluginDependency</string>
<string>80.IBPluginDependency</string>
+ <string>84.IBPluginDependency</string>
+ <string>85.IBPluginDependency</string>
+ <string>86.IBPluginDependency</string>
+ <string>87.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilderKit</string>
<string>com.apple.InterfaceBuilderKit</string>
- <string>{{633, 442}, {570, 514}}</string>
+ <string>{{633, 412}, {570, 544}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{633, 442}, {570, 514}}</string>
+ <string>{{633, 412}, {570, 544}}</string>
<integer value="1"/>
<string>{196, 240}</string>
<string>{{202, 428}, {480, 270}}</string>
@@ -638,6 +728,10 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -660,7 +754,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">83</int>
+ <int key="maxID">89</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -672,13 +766,21 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>addNewAddress:</string>
+ <string>addNewCreditCard:</string>
<string>cancel:</string>
+ <string>deleteAddress:</string>
+ <string>deleteCreditCard:</string>
<string>save:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib
index 71c46a3..9800b61 100644
--- a/chrome/app/nibs/Preferences.xib
+++ b/chrome/app/nibs/Preferences.xib
@@ -3,13 +3,14 @@
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">9L31a</string>
- <string key="IBDocument.InterfaceBuilderVersion">677</string>
+ <string key="IBDocument.InterfaceBuilderVersion">680</string>
<string key="IBDocument.AppKitVersion">949.54</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="74"/>
<integer value="481"/>
+ <integer value="74"/>
+ <integer value="482"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1159,6 +1160,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<string key="NSFrame">{{1, 1}, {305, 63}}</string>
<reference key="NSSuperview" ref="54854923"/>
+ <reference key="NSNextKeyView" ref="165250101"/>
<reference key="NSDocView" ref="165250101"/>
<reference key="NSBGColor" ref="452188023"/>
<int key="NScvFlags">4</int>
@@ -1186,6 +1188,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<string key="NSFrame">{{203, 321}, {307, 65}}</string>
<reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSNextKeyView" ref="570210247"/>
<int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="895676258"/>
<reference key="NSHScroller" ref="757862790"/>
@@ -1638,7 +1641,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="393583039">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2265,6 +2268,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<string key="NSFrameSize">{530, 408}</string>
+ <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="933437956">
@@ -3582,6 +3586,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">640</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">autoFillSettingsButton_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="501995472"/>
+ </object>
+ <int key="connectionID">641</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -5044,7 +5056,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{85, 388}, {530, 468}}</string>
+ <string>{{203, 356}, {530, 468}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -5119,7 +5131,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{296, 233}, {443, 623}}</string>
+ <string>{{367, 295}, {443, 623}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5159,7 +5171,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">640</int>
+ <int key="maxID">641</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5350,6 +5362,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>autoFillSettingsButton_</string>
<string>basicsGroupDefaultBrowser_</string>
<string>basicsGroupHomePage_</string>
<string>basicsGroupSearchEngine_</string>
@@ -5378,6 +5391,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSButton</string>
<string>NSArray</string>
<string>NSArray</string>
<string>NSArray</string>