Autofill i18n: Set postal code and state field labels based on the selected country.

chrome/browser/autofill/autofill_profile.h

Index: chrome/browser/autofill/autofill_profile.h
diff --git a/chrome/browser/autofill/autofill_profile.h b/chrome/browser/autofill/autofill_profile.h
index f86ea9b18714015bcbb6808aece87927dcb09150..207f6bd1d787195ad74889bb277db2a28d1385e7 100644
--- a/chrome/browser/autofill/autofill_profile.h
+++ b/chrome/browser/autofill/autofill_profile.h
@@ -13,7 +13,6 @@
 #include "base/string16.h"
 #include "chrome/browser/autofill/form_group.h"
 
-class Address;
 typedef std::map<FieldTypeGroup, FormGroup*> FormGroupMap;
 
 // A collection of FormGroups stored in a profile.  AutoFillProfile also
@@ -47,12 +46,16 @@ class AutoFillProfile : public FormGroup {
   // The user-visible label of the profile, generated in relation to other
   // profiles. Shows at least 2 fields that differentiate profile from other
   // profiles. See AdjustInferredLabels() further down for more description.
-  virtual const string16 Label() const;
+  virtual string16 Label() const;

[dhollowa, 2011/02/17 00:55:28]

Please put the |const| designation back.  See item 3 of Effective-C++ for
details.  Quote: "...reduce incidence of client errors without giving up on
safety or efficiency".

[Ilya Sherman, 2011/02/17 23:09:11]

Done.

 
   // This guid is the primary identifier for |AutoFillProfile| objects.
   const std::string guid() const { return guid_; }
   void set_guid(const std::string& guid) { guid_ = guid; }
 
+  // Accessors for the stored address's country code.
+  std::string CountryCode() const;

[dhollowa, 2011/02/17 00:55:28]

const std::string CountryCode() const;

[Ilya Sherman, 2011/02/17 23:09:11]

Done.

+  void SetCountryCode(const std::string& country_code);
+
   // Adjusts the labels according to profile data.
   // Labels contain minimal different combination of:
   // 1. Full name.