sync/engine/process_commit_response_command.cc - Issue 10933075: FYI: Remove PerModelSafeGroupState + move ConflictResolution

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

Issue 10933075: FYI: Remove PerModelSafeGroupState + move ConflictResolution (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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: sync/engine/process_commit_response_command.cc

diff --git a/sync/engine/process_commit_response_command.cc b/sync/engine/process_commit_response_command.cc

index 8a00608f925bd143a18a35006565e753447bc870..2f84619ec61ef418a9a9bf332ab88a757de9faea 100644

--- a/sync/engine/process_commit_response_command.cc

+++ b/sync/engine/process_commit_response_command.cc

@@ -32,7 +32,6 @@ namespace syncer {

using sessions::OrderedCommitSet;

using sessions::StatusController;

using sessions::SyncSession;

-using sessions::ConflictProgress;

using syncable::WriteTransaction;

using syncable::MutableEntry;

using syncable::Entry;

@@ -110,7 +109,6 @@ SyncerError ProcessCommitResponseCommand::ProcessCommitResponse(

int successes = 0;

set<syncable::Id> deleted_folders;

- ConflictProgress* conflict_progress = status->mutable_conflict_progress();

OrderedCommitSet::Projection proj = status->commit_id_projection(

commit_set_);

@@ -129,8 +127,7 @@ SyncerError ProcessCommitResponseCommand::ProcessCommitResponse(

break;

case CommitResponse::CONFLICT:

++conflicting_commits;

- conflict_progress->AddServerConflictingItemById(

- commit_set_.GetCommitIdAt(proj[i]));

+ status->increment_num_server_conflicts();

break;

case CommitResponse::SUCCESS:

// TODO(sync): worry about sync_rate_ rate calc?

« no previous file with comments | « sync/engine/conflict_resolver.cc ('k') | sync/engine/process_updates_command.h » ('j') | no next file with comments »