components/autofill/core/browser/webdata/autofill_profile_syncable_service.h - Issue 1143253012: More work on removing variants from Autofill

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/webdata/autofill_profile_syncable_service.h

Issue 1143253012: More work on removing variants from Autofill (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: work around iOS lameness Created 5 years, 6 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/webdata/autofill_profile_syncable_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/autofill/core/browser/webdata/autofill_profile_syncable_service.h

diff --git a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h

index 65f03604c6481d25fdc5431c6785670c39e24d96..75757deca38d430ca94796702863b28639f60f50 100644

--- a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h

+++ b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h

@@ -167,8 +167,8 @@ class AutofillProfileSyncableService

AutofillProfile* autofill_profile);

// Calls merge_into->OverwriteWithOrAddTo() and then checks if the

- // multi-valued field values that are not in |merge_from|.

+ // |merge_into| has extra data. Returns true if |merge_from| needs updating to

+ // be in sync with |merge_into|.

// TODO(isherman): Seems like this should return |true| if |merge_into| was

// modified at all: http://crbug.com/248440

static bool MergeProfile(const AutofillProfile& merge_from,