sync/internal_api/public/non_blocking_sync_common.cc - Issue 1918923002: [Sync] USS: Ignore encryption changes during conflict resolution 1/2

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: sync/internal_api/public/non_blocking_sync_common.cc

Issue 1918923002: [Sync] USS: Ignore encryption changes during conflict resolution 1/2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« sync/internal_api/processor_entity_tracker_unittest.cc ('K') | « sync/internal_api/public/non_blocking_sync_common.h ('k') | sync/internal_api/public/processor_entity_tracker.h » ('j') | sync/internal_api/public/processor_entity_tracker.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sync/internal_api/public/non_blocking_sync_common.cc

diff --git a/sync/internal_api/public/non_blocking_sync_common.cc b/sync/internal_api/public/non_blocking_sync_common.cc

index 7f7c8f966672a94a6fe0384821b8175f05341884..df4f19b331dafb4ae9fb9786214ac20ccf6d3b4f 100644

--- a/sync/internal_api/public/non_blocking_sync_common.cc

+++ b/sync/internal_api/public/non_blocking_sync_common.cc

@@ -14,6 +14,9 @@ CommitRequestData::~CommitRequestData() {}

CommitResponseData::CommitResponseData() {}

+CommitResponseData::CommitResponseData(const CommitResponseData& other) =

+ default;

CommitResponseData::~CommitResponseData() {}

UpdateResponseData::UpdateResponseData() {}