components/autofill/core/browser/phone_number.cc - Issue 374053007: Change PhoneNumber::SetInfo to only apply formatting where there is none

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/autofill/core/browser/phone_number.cc

Issue 374053007: Change PhoneNumber::SetInfo to only apply formatting where there is none (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: better way Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/autofill/core/browser/personal_data_manager_unittest.cc ('k') | components/autofill/core/browser/phone_number_i18n.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/autofill/core/browser/phone_number.cc

diff --git a/components/autofill/core/browser/phone_number.cc b/components/autofill/core/browser/phone_number.cc

index 66971ae05f5892286d11496557ca233f549cc025..6783677e3e77644882418e3098d1b94727ed3b56 100644

--- a/components/autofill/core/browser/phone_number.cc

+++ b/components/autofill/core/browser/phone_number.cc

@@ -134,9 +134,16 @@ bool PhoneNumber::SetInfo(const AutofillType& type,

if (number_.empty())

return true;

- // Store a formatted (i.e., pretty printed) version of the number.

+ // Store a formatted (i.e., pretty printed) version of the number if either

+ // the number doesn't contain formatting marks.

UpdateCacheIfNeeded(app_locale);

- number_ = cached_parsed_phone_.GetFormattedNumber();

+ if (base::ContainsOnlyChars(number_, base::ASCIIToUTF16("+0123456789"))) {

+ number_ = cached_parsed_phone_.GetFormattedNumber();

+ } else if (i18n::NormalizePhoneNumber(

+ number_, GetRegion(*profile_, app_locale)).empty()) {

+ // The number doesn't make sense for this region; clear it.

+ number_.clear();

+ }

return !number_.empty();

}