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

chrome/browser/autofill/autofill_type.cc

 // 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.
 
 #include "chrome/browser/autofill/autofill_type.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 
 namespace {
 
 const AutofillType::AutofillTypeDefinition kUnknownAutofillTypeDefinition = {
   /* UNKNOWN_TYPE */ AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP
 };
 
 AutofillType::AutofillTypeDefinition kAutofillTypeDefinitions[] = {
   // NO_SERVER_DATA
   { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
   // UNKNOWN_TYPE
   kUnknownAutofillTypeDefinition,
   // EMPTY_TYPE
   { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
 
   // NAME_FIRST
-  { AutofillType::CONTACT_INFO, AutofillType::NO_SUBGROUP },
+  { AutofillType::NAME, AutofillType::NO_SUBGROUP },
   // NAME_MIDDLE
-  { AutofillType::CONTACT_INFO, AutofillType::NO_SUBGROUP },
+  { AutofillType::NAME, AutofillType::NO_SUBGROUP },
   // NAME_LAST
-  { AutofillType::CONTACT_INFO, AutofillType::NO_SUBGROUP },
+  { AutofillType::NAME, AutofillType::NO_SUBGROUP },
   // NAME_MIDDLE_INITIAL
-  { AutofillType::CONTACT_INFO, AutofillType::NO_SUBGROUP },
+  { AutofillType::NAME, AutofillType::NO_SUBGROUP },
   // NAME_FULL
-  { AutofillType::CONTACT_INFO, AutofillType::NO_SUBGROUP },
+  { AutofillType::NAME, AutofillType::NO_SUBGROUP },
   // NAME_SUFFIX
-  { AutofillType::CONTACT_INFO, AutofillType::NO_SUBGROUP },
+  { AutofillType::NAME, AutofillType::NO_SUBGROUP },
 
   // EMAIL_ADDRESS
-  { AutofillType::CONTACT_INFO, AutofillType::NO_SUBGROUP },
+  { AutofillType::EMAIL, AutofillType::NO_SUBGROUP },
 
   // PHONE_HOME_NUMBER
   { AutofillType::PHONE_HOME, AutofillType::PHONE_NUMBER },
   // PHONE_HOME_CITY_CODE
   { AutofillType::PHONE_HOME, AutofillType::PHONE_CITY_CODE },
   // PHONE_HOME_COUNTRY_CODE
   { AutofillType::PHONE_HOME, AutofillType::PHONE_COUNTRY_CODE },
   // PHONE_HOME_CITY_AND_NUMBER
   { AutofillType::PHONE_HOME, AutofillType::PHONE_CITY_AND_NUMBER },
   // PHONE_HOME_WHOLE_NUMBER
@@ skipping 76 matching lines @@
   // CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR
   { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
   // CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR
   { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
   // CREDIT_CARD_TYPE
   { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
   // CREDIT_CARD_VERIFICATION_CODE
   { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
 
   // COMPANY_NAME
-  { AutofillType::CONTACT_INFO, AutofillType::NO_SUBGROUP },
+  { AutofillType::COMPANY, AutofillType::NO_SUBGROUP },
 };
 
 }  // namespace
 
 AutofillType::AutofillType(AutofillFieldType field_type) {
   if ((field_type < NO_SERVER_DATA || field_type >= MAX_VALID_FIELD_TYPE) ||
       (field_type >= 15 && field_type <= 19) ||
       (field_type >= 25 && field_type <= 29) ||
       (field_type >= 44 && field_type <= 50))
     field_type_ = UNKNOWN_TYPE;
@@ skipping 239 matching lines @@
   if (str == "CREDIT_CARD_TYPE")
     return CREDIT_CARD_TYPE;
   if (str == "CREDIT_CARD_VERIFICATION_CODE")
     return CREDIT_CARD_VERIFICATION_CODE;
   if (str == "COMPANY_NAME")
     return COMPANY_NAME;
 
   NOTREACHED() << "Unknown AutofillFieldType " << str;
   return UNKNOWN_TYPE;
 }