components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc - Issue 2163783002: [Merge M53] Run autofill-profile de-dupe after sync starts if sync is enabled.

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.cc

Issue 2163783002: [Merge M53] Run autofill-profile de-dupe after sync starts if sync is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785

Patch Set: Created 4 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/webdata/autofill_data_type_controller_unittest.cc ('k') | components/autofill/core/browser/webdata/autofill_wallet_metadata_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.cc

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

index 353a993b8d74573c257a0c65ccf15c9f3d9a87d1..cd99e11a2aadc10c9926a21498dea92aa64ca4f1 100644

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

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

@@ -194,8 +194,10 @@ AutofillProfileSyncableService::MergeDataAndStartSyncing(

sync_processor_->ProcessSyncChanges(FROM_HERE, new_changes));

}

- if (webdata_backend_)

+ if (webdata_backend_) {

webdata_backend_->NotifyOfMultipleAutofillChanges();

+ webdata_backend_->NotifyThatSyncHasStarted(type);

+ }

return merge_result;

}

@@ -550,6 +552,7 @@ AutofillProfileSyncableService::CreateOrUpdateProfile(

// we will merge them.

bundle->candidates_to_merge.insert(

std::make_pair(local_profile->guid(), new_profile));

+ break;

}

profiles_.push_back(new_profile);