| Index: chrome/browser/autofill/autofill_type.cc
|
| diff --git a/chrome/browser/autofill/autofill_type.cc b/chrome/browser/autofill/autofill_type.cc
|
| index b53d997f9956cda2af5d8cf652ffd29d63666582..4ee635016dbef73082b66cfdfd920a57ed73878d 100644
|
| --- a/chrome/browser/autofill/autofill_type.cc
|
| +++ b/chrome/browser/autofill/autofill_type.cc
|
| @@ -10,11 +10,15 @@
|
|
|
| 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
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| + kUnknownAutofillTypeDefinition,
|
| // EMPTY_TYPE
|
| { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
|
|
| @@ -46,11 +50,11 @@ AutofillType::AutofillTypeDefinition kAutofillTypeDefinitions[] = {
|
| { AutofillType::PHONE_HOME, AutofillType::PHONE_WHOLE_NUMBER },
|
|
|
| // Work phone numbers (values [15,19]) are deprecated.
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| + kUnknownAutofillTypeDefinition,
|
| + kUnknownAutofillTypeDefinition,
|
| + kUnknownAutofillTypeDefinition,
|
| + kUnknownAutofillTypeDefinition,
|
| + kUnknownAutofillTypeDefinition,
|
|
|
| // PHONE_FAX_NUMBER
|
| { AutofillType::PHONE_FAX, AutofillType::PHONE_NUMBER },
|
| @@ -64,11 +68,11 @@ AutofillType::AutofillTypeDefinition kAutofillTypeDefinitions[] = {
|
| { AutofillType::PHONE_FAX, AutofillType::PHONE_WHOLE_NUMBER },
|
|
|
| // Cell phone numbers (values [25, 29]) are deprecated.
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| + kUnknownAutofillTypeDefinition,
|
| + kUnknownAutofillTypeDefinition,
|
| + kUnknownAutofillTypeDefinition,
|
| + kUnknownAutofillTypeDefinition,
|
| + kUnknownAutofillTypeDefinition,
|
|
|
| // ADDRESS_HOME_LINE1
|
| { AutofillType::ADDRESS_HOME, AutofillType::ADDRESS_LINE1 },
|
| @@ -101,13 +105,13 @@ AutofillType::AutofillTypeDefinition kAutofillTypeDefinitions[] = {
|
| { AutofillType::ADDRESS_BILLING, AutofillType::ADDRESS_COUNTRY },
|
|
|
| // ADDRESS_SHIPPING values [44,50] are deprecated.
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| - { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
|
| + kUnknownAutofillTypeDefinition,
|
| + kUnknownAutofillTypeDefinition,
|
| + kUnknownAutofillTypeDefinition,
|
| + kUnknownAutofillTypeDefinition,
|
| + kUnknownAutofillTypeDefinition,
|
| + kUnknownAutofillTypeDefinition,
|
| + kUnknownAutofillTypeDefinition,
|
|
|
| // CREDIT_CARD_NAME
|
| { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
|
|
|