| Index: components/autofill/core/browser/autofill_country.cc
|
| diff --git a/components/autofill/core/browser/autofill_country.cc b/components/autofill/core/browser/autofill_country.cc
|
| index 52428d6440bfb70ba7a9f7f4cf81680fba2cdd8e..ff52e321bbb549574f0e28962d934c15af050d70 100644
|
| --- a/components/autofill/core/browser/autofill_country.cc
|
| +++ b/components/autofill/core/browser/autofill_country.cc
|
| @@ -66,9 +66,6 @@ const StaticCountryData kCountryData[] = {
|
| { "AM", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
|
| IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
|
| ADDRESS_REQUIREMENTS_UNKNOWN } },
|
| - { "AN", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
|
| - IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
|
| - ADDRESS_REQUIREMENTS_UNKNOWN } },
|
| { "AO", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
|
| IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
|
| ADDRESS_REQUIREMENTS_UNKNOWN } },
|
| @@ -756,6 +753,9 @@ const StaticCountryData kCountryData[] = {
|
| { "WS", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
|
| IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
|
| ADDRESS_REQUIREMENTS_UNKNOWN } },
|
| + { "XK", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
|
| + IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
|
| + ADDRESS_REQUIREMENTS_UNKNOWN } },
|
| { "YE", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
|
| IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
|
| ADDRESS_REQUIRES_CITY } },
|
| @@ -1044,15 +1044,18 @@ const std::string CountryNames::GetSortKey(const icu::Collator& collator,
|
|
|
| AutofillCountry::AutofillCountry(const std::string& country_code,
|
| const std::string& locale) {
|
| - const CountryDataMap::Iterator result = CountryDataMap::Find(country_code);
|
| - DCHECK(result != CountryDataMap::End());
|
| - const CountryData& data = result->second;
|
| -
|
| country_code_ = country_code;
|
| name_ = l10n_util::GetDisplayNameForCountry(country_code, locale);
|
| - postal_code_label_ = l10n_util::GetStringUTF16(data.postal_code_label_id);
|
| - state_label_ = l10n_util::GetStringUTF16(data.state_label_id);
|
| - address_required_fields_ = data.address_required_fields;
|
| +
|
| + const CountryDataMap::Iterator result = CountryDataMap::Find(country_code);
|
| + if (result != CountryDataMap::End()) {
|
| + const CountryData& data = result->second;
|
| + postal_code_label_ = l10n_util::GetStringUTF16(data.postal_code_label_id);
|
| + state_label_ = l10n_util::GetStringUTF16(data.state_label_id);
|
| + address_required_fields_ = data.address_required_fields;
|
| + } else {
|
| + postal_code_label_ = state_label_ = base::ASCIIToUTF16("[UNKNOWN]");
|
| + }
|
| }
|
|
|
| AutofillCountry::~AutofillCountry() {
|
|
|