diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 23:20:50 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 23:20:50 +0000 |
| commit | 78d285fd8f8b3536bf75024281adc53aa2a0e778 (patch) | |
| tree | 648c66611c482030c3dc2c7ac9fc072ddbb13cdd /chrome/browser/autofill | |
| parent | ece35f041c126484a5f93fd5607cd2b3f343966e (diff) | |
| download | chromium_src-78d285fd8f8b3536bf75024281adc53aa2a0e778.zip chromium_src-78d285fd8f8b3536bf75024281adc53aa2a0e778.tar.gz chromium_src-78d285fd8f8b3536bf75024281adc53aa2a0e778.tar.bz2 | |
Eliminate static initialization in autofill_type.cc
The code prior to this CL invoked a copy constructor during static initialization.
BUG=none
TEST=none
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=98924
Review URL: http://codereview.chromium.org/7785016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autofill')
| -rw-r--r-- | chrome/browser/autofill/autofill_type.cc | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/chrome/browser/autofill/autofill_type.cc b/chrome/browser/autofill/autofill_type.cc index 4ee6350..b53d997 100644 --- a/chrome/browser/autofill/autofill_type.cc +++ b/chrome/browser/autofill/autofill_type.cc @@ -10,15 +10,11 @@ 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, + { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP }, // EMPTY_TYPE { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP }, @@ -50,11 +46,11 @@ AutofillType::AutofillTypeDefinition kAutofillTypeDefinitions[] = { { AutofillType::PHONE_HOME, AutofillType::PHONE_WHOLE_NUMBER }, // Work phone numbers (values [15,19]) are deprecated. - kUnknownAutofillTypeDefinition, - kUnknownAutofillTypeDefinition, - kUnknownAutofillTypeDefinition, - kUnknownAutofillTypeDefinition, - kUnknownAutofillTypeDefinition, + { 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 }, // PHONE_FAX_NUMBER { AutofillType::PHONE_FAX, AutofillType::PHONE_NUMBER }, @@ -68,11 +64,11 @@ AutofillType::AutofillTypeDefinition kAutofillTypeDefinitions[] = { { AutofillType::PHONE_FAX, AutofillType::PHONE_WHOLE_NUMBER }, // Cell phone numbers (values [25, 29]) are deprecated. - kUnknownAutofillTypeDefinition, - kUnknownAutofillTypeDefinition, - kUnknownAutofillTypeDefinition, - kUnknownAutofillTypeDefinition, - kUnknownAutofillTypeDefinition, + { 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 }, // ADDRESS_HOME_LINE1 { AutofillType::ADDRESS_HOME, AutofillType::ADDRESS_LINE1 }, @@ -105,13 +101,13 @@ AutofillType::AutofillTypeDefinition kAutofillTypeDefinitions[] = { { AutofillType::ADDRESS_BILLING, AutofillType::ADDRESS_COUNTRY }, // ADDRESS_SHIPPING values [44,50] are deprecated. - kUnknownAutofillTypeDefinition, - kUnknownAutofillTypeDefinition, - kUnknownAutofillTypeDefinition, - kUnknownAutofillTypeDefinition, - kUnknownAutofillTypeDefinition, - kUnknownAutofillTypeDefinition, - kUnknownAutofillTypeDefinition, + { 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 }, // CREDIT_CARD_NAME { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP }, |