components/sync/device_info/device_info_sync_bridge.h - Issue 2923363004: [Sync] Migrate bridge implementations to change list based MergeSyncData

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/sync/device_info/device_info_sync_bridge.h

Issue 2923363004: [Sync] Migrate bridge implementations to change list based MergeSyncData (Closed)

Patch Set: Created 3 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:

Index: components/sync/device_info/device_info_sync_bridge.h

diff --git a/components/sync/device_info/device_info_sync_bridge.h b/components/sync/device_info/device_info_sync_bridge.h

index ca5641e864c7d872eaf2ddeca0ffd663fa4cbd4a..ab6d46a47f36f2668b4a1321238f2e76b0f9a766 100644

--- a/components/sync/device_info/device_info_sync_bridge.h

+++ b/components/sync/device_info/device_info_sync_bridge.h

@@ -43,7 +43,7 @@ class DeviceInfoSyncBridge : public ModelTypeSyncBridge,

std::unique_ptr<MetadataChangeList> CreateMetadataChangeList() override;

base::Optional<ModelError> MergeSyncData(

std::unique_ptr<MetadataChangeList> metadata_change_list,

- EntityDataMap entity_data_map) override;

+ EntityChangeList entity_data) override;

base::Optional<ModelError> ApplySyncChanges(

std::unique_ptr<MetadataChangeList> metadata_change_list,

EntityChangeList entity_changes) override;