sync/engine/model_type_worker.h - Issue 1933803002: [Sync] USS: Ignore encryption changes during conflict resolution 2/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/engine/model_type_worker.h

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

Patch Set: Can't use &&, whoops. 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

Index: sync/engine/model_type_worker.h

diff --git a/sync/engine/model_type_worker.h b/sync/engine/model_type_worker.h

index fae02f016603cfc0794c37349249380f1af3a069..bd415385225e1446d7ca58dab9c05865a47caaf0 100644

--- a/sync/engine/model_type_worker.h

+++ b/sync/engine/model_type_worker.h

@@ -93,7 +93,7 @@ class SYNC_EXPORT ModelTypeWorker : public syncer::UpdateHandler,

size_t max_entries) override;

// Callback for when our contribution gets a response.

- void OnCommitResponse(const CommitResponseDataList& response_list);

+ void OnCommitResponse(CommitResponseDataList* response_list);

base::WeakPtr<ModelTypeWorker> AsWeakPtr();

« no previous file with comments | « no previous file | sync/engine/model_type_worker.cc » ('j') | sync/engine/worker_entity_tracker.h » ('J')