Index: components/autofill/core/browser/phone_number_i18n.cc |
diff --git a/components/autofill/core/browser/phone_number_i18n.cc b/components/autofill/core/browser/phone_number_i18n.cc |
index 72b2e1f481849956d8091f5bc9adb460ff4ddc0c..9b424505db03ba00d7b0e406d06f834d8f84af55 100644 |
--- a/components/autofill/core/browser/phone_number_i18n.cc |
+++ b/components/autofill/core/browser/phone_number_i18n.cc |
@@ -63,13 +63,37 @@ void FormatValidatedNumber(const PhoneNumber& number, |
PhoneNumberUtil* phone_util = PhoneNumberUtil::GetInstance(); |
std::string processed_number; |
- phone_util->Format(number, format, &processed_number); |
+ |
+ std::string region_code; |
+ phone_util->GetRegionCodeForNumber(number, ®ion_code); |
+ |
+ // Formats a phone number in the specified format using default rules. |
+ // This applies to the following cases: |
+ // The phone number contains alphabetic letter(s). |
+ // The phone number with a leading IDD. |
Ilya Sherman
2014/07/02 22:23:54
nit: Please spell out the acronym "IDD", and clari
|
+ // The phone number without a leading '+' sign. |
+ if (phone_util->IsAlphaNumber(number.raw_input()) || |
+ (number.has_country_code_source() && |
+ (number.country_code_source() == PhoneNumber::FROM_NUMBER_WITH_IDD || |
+ number.country_code_source() == |
+ PhoneNumber::FROM_NUMBER_WITHOUT_PLUS_SIGN))) { |
+ phone_util->Format(number, format, &processed_number); |
+ } else { |
+ phone_util->FormatInOriginalFormat (number, region_code, &processed_number); |
Ilya Sherman
2014/07/02 22:23:54
nit: Please omit the space before the paren.
|
+ } |
if (formatted_number) |
*formatted_number = base::UTF8ToUTF16(processed_number); |
Ilya Sherman
2014/07/02 22:23:54
Where is the |formatted_number| used? Should the
|
if (normalized_number) { |
- phone_util->NormalizeDigitsOnly(&processed_number); |
+ // Keep the leading '+' while normalising numbers, excluding US numbers. |
+ if (processed_number[0] == '+' && region_code.compare("US")) { |
Ilya Sherman
2014/07/02 22:23:54
nit: Please write the second condition as |region_
|
+ processed_number = processed_number.substr(1, processed_number.length()); |
+ phone_util->NormalizeDigitsOnly(&processed_number); |
+ processed_number.insert(processed_number.begin(), '+'); |
+ } else { |
+ phone_util->NormalizeDigitsOnly(&processed_number); |
+ } |
*normalized_number = base::UTF8ToUTF16(processed_number); |
} |
} |
@@ -100,7 +124,9 @@ bool ParsePhoneNumber(const base::string16& value, |
// The |default_region| should already be sanitized. |
DCHECK_EQ(2U, default_region.size()); |
- if (phone_util->Parse(number_text, default_region, i18n_number) != |
+ if (phone_util->ParseAndKeepRawInput(number_text, |
+ default_region, |
+ i18n_number) != |
PhoneNumberUtil::NO_PARSING_ERROR) { |
return false; |
} |