Autofill extend profiles to include multi-valued fields, part 2.

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/address.h"
+#include "chrome/browser/autofill/contact_info.h"
+#include "chrome/browser/autofill/fax_number.h"
 #include "chrome/browser/autofill/form_group.h"
+#include "chrome/browser/autofill/home_phone_number.h"
 
 // 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);
 
   // For use in STL containers.
   AutoFillProfile();
   AutoFillProfile(const AutoFillProfile&);
   virtual ~AutoFillProfile();
 
+  AutoFillProfile& operator=(const AutoFillProfile& profile);
+
   // FormGroup implementation:
   virtual void GetPossibleFieldTypes(const string16& text,
                                      FieldTypeSet* possible_types) const;
   virtual void GetAvailableFieldTypes(FieldTypeSet* available_types) const;
   virtual string16 GetFieldText(const AutofillType& type) const;
-  // Returns true if the info matches the profile data corresponding to type.
-  // If the type is UNKNOWN_TYPE then info will be matched against all of the
+  // Returns true if the |input| matches the profile data corresponding to type.
+  // If the type is UNKNOWN_TYPE then |input| will be matched against all of the
   // profile data.
   virtual void FindInfoMatches(const AutofillType& type,
-                               const string16& info,
+                               const string16& input,

[Ilya Sherman, 2011/03/09 00:50:50]

nit: Perhaps use "value" to parallel SetInfo() below?

[dhollowa, 2011/03/09 01:55:47]

Done.

                                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;
 
   // 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.
@@ skipping 25 matching lines @@
   static void CreateInferredLabels(
       const std::vector<AutoFillProfile*>* profiles,
       const std::vector<AutofillFieldType>* suggested_fields,
       AutofillFieldType excluded_field,
       size_t minimal_fields_shown,
       std::vector<string16>* created_labels);
 
   // Returns true if there are no values (field types) set.
   bool IsEmpty() const;
 
-  // For use in STL containers.
-  void operator=(const AutoFillProfile&);
-
   // Comparison for Sync.  Returns 0 if the profile is the same as |this|,
   // or < 0, or > 0 if it is different.  The implied ordering can be used for
   // culling duplicates.  The ordering is based on collation order of the
   // textual contents of the fields.
   // GUIDs are not compared, only the values of the contents themselves.
   int Compare(const AutoFillProfile& profile) const;
 
   // Equality operators compare GUIDs and the contents in the comparison.
   bool operator==(const AutoFillProfile& profile) const;
   virtual bool operator!=(const AutoFillProfile& profile) const;
 
   // Returns concatenation of full name and address line 1.  This acts as the
   // basis of comparison for new values that are submitted through forms to
   // aid with correct aggregation of new data.
   const string16 PrimaryValue() const;
 
  private:
-  typedef std::map<FieldTypeGroup, FormGroup*> FormGroupMap;
+  typedef std::vector<const FormGroup*> FormGroupList;
+  typedef std::map<FieldTypeGroup, const FormGroup*> FormGroupMap;
+  typedef std::map<FieldTypeGroup, FormGroup*> MutableFormGroupMap;
 
   // Builds inferred label from the first |num_fields_to_include| non-empty
   // fields in |label_fields|. Uses as many fields as possible if there are not
   // enough non-empty fields.
   string16 ConstructInferredLabel(
       const std::vector<AutofillFieldType>& label_fields,
       size_t num_fields_to_include) const;
 
   // Creates inferred labels for |profiles| at indices corresponding to
   // |indices|, and stores the results to the corresponding elements of
   // |created_labels|. These labels include enough fields to differentiate among
   // the profiles, if possible; and also at least |num_fields_to_include|
   // fields, if possible. The label fields are drawn from |fields|.
   static void CreateDifferentiatingLabels(
       const std::vector<AutoFillProfile*>& profiles,
       const std::list<size_t>& indices,
       const std::vector<AutofillFieldType>& fields,
       size_t num_fields_to_include,
       std::vector<string16>* created_labels);
 
-  // Utility to initialize a |FormGroupMap|.
-  static void InitPersonalInfo(FormGroupMap* personal_info);
+  // Utilities for listing and lookup of the data members that constitute
+  // user-visible profile information.
+  FormGroupList info_list() const;
+  FormGroupMap info_map() const;
+  MutableFormGroupMap mutable_info_map();
 
   // The label presented to the user when selecting a profile.
   string16 label_;
 
   // The guid of this profile.
   std::string guid_;
 
   // Personal information for this profile.
-  FormGroupMap personal_info_;
+  NameInfo name_;
+  EmailInfo email_;
+  CompanyInfo company_;
+  HomePhoneNumber home_number_;
+  FaxNumber fax_number_;
+  Address address_;
 };
 
 // So we can compare AutoFillProfiles with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const AutoFillProfile& profile);
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_PROFILE_H_