AutoFill Mac UI telephone/fax fields now one.

Changes telephone and fax number entries in the Mac AutoFill dialog to be a single
text field for all three (1) country code, (2) area code, (3) number.

Renames address model fields city, state, country to be addressCity, addressState,
addressCountry.  This was due to subtle name clash with 'state' as a selector.

Nib changes: (1) changes bindings to reflect the renaming of city, state, and country
in the model.  (2)  collapse telephone and fax numbers from three fields each to a single field.

BUG=41233
TEST=AutoFillAddressModelTest, AutoFillCreditCardModelTest, AutoFillAddressViewControllerTest, AutoFillCreditCardViewControllerTest

Review URL: http://codereview.chromium.org/1625020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44933 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 20 deletions

diff --git a/chrome/browser/autofill/autofill_address_model_mac.h b/chrome/browser/autofill/autofill_address_model_mac.h
index 92d02ae..9ea052f 100644
--- a/chrome/browser/autofill/autofill_address_model_mac.h
+++ b/chrome/browser/autofill/autofill_address_model_mac.h
@@ -29,16 +29,12 @@ class AutoFillProfile;
   NSString* companyName_;
   NSString* addressLine1_;
   NSString* addressLine2_;
-  NSString* city_;
-  NSString* state_;
-  NSString* zip_;
-  NSString* country_;
-  NSString* phoneCountryCode_;
-  NSString* phoneAreaCode_;
-  NSString* phoneNumber_;
-  NSString* faxCountryCode_;
-  NSString* faxAreaCode_;
-  NSString* faxNumber_;
+  NSString* addressCity_;
+  NSString* addressState_;
+  NSString* addressZip_;
+  NSString* addressCountry_;
+  NSString* phoneWholeNumber_;
+  NSString* faxWholeNumber_;
 }
 
 // |summary| is a derived property based on |firstName|, |lastName| and
@@ -53,16 +49,12 @@ class AutoFillProfile;
 @property (nonatomic, copy) NSString* companyName;
 @property (nonatomic, copy) NSString* addressLine1;
 @property (nonatomic, copy) NSString* addressLine2;
-@property (nonatomic, copy) NSString* city;
-@property (nonatomic, copy) NSString* state;
-@property (nonatomic, copy) NSString* zip;
-@property (nonatomic, copy) NSString* country;
-@property (nonatomic, copy) NSString* phoneCountryCode;
-@property (nonatomic, copy) NSString* phoneAreaCode;
-@property (nonatomic, copy) NSString* phoneNumber;
-@property (nonatomic, copy) NSString* faxCountryCode;
-@property (nonatomic, copy) NSString* faxAreaCode;
-@property (nonatomic, copy) NSString* faxNumber;
+@property (nonatomic, copy) NSString* addressCity;
+@property (nonatomic, copy) NSString* addressState;
+@property (nonatomic, copy) NSString* addressZip;
+@property (nonatomic, copy) NSString* addressCountry;
+@property (nonatomic, copy) NSString* phoneWholeNumber;
+@property (nonatomic, copy) NSString* faxWholeNumber;
 
 // The designated initializer. Initializes the property strings to values
 // retrieved from the |profile|.