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

chrome/browser/autofill/autofill_profile.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_AUTOFILL_AUTOFILL_PROFILE_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_PROFILE_H_
 #pragma once
 
 #include <list>
 #include <map>
 #include <vector>
 
 #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
 // implements the FormGroup interface so that owners of this object can request
 // form information from the profile, and the profile will delegate the request
 // to the requested form group type.
 class AutoFillProfile : public FormGroup {
  public:
   explicit AutoFillProfile(const std::string& guid);
 
@@ skipping 13 matching lines @@
   virtual void FindInfoMatches(const AutoFillType& type,
                                const string16& info,
                                std::vector<string16>* matched_text) const;
   virtual void SetInfo(const AutoFillType& type, const string16& value);
   // Returns a copy of the profile it is called on. The caller is responsible
   // for deleting profile when they are done with it.
   virtual FormGroup* Clone() const;
   // 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.
   // 2. Address.
   // 3. E-mail.
   // 4. Phone.
   // 5. Fax.
   // 6. Company name.
   // Profile labels are changed accordingly to these rules.
   // Returns true if any of the profiles were updated.
@@ skipping 71 matching lines @@
   std::string guid_;
 
   // Personal information for this profile.
   FormGroupMap personal_info_;
 };
 
 // So we can compare AutoFillProfiles with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const AutoFillProfile& profile);
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_PROFILE_H_