sync/internal_api/public/sessions/model_neutral_state.h - Issue 11314008: sync: Follow-up to conflict resolution refactor

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/sessions/model_neutral_state.h

Issue 11314008: sync: Follow-up to conflict resolution refactor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix tests Created 8 years, 2 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/internal_api/public/sessions/model_neutral_state.h

diff --git a/sync/internal_api/public/sessions/model_neutral_state.h b/sync/internal_api/public/sessions/model_neutral_state.h

index 96441756b5f7fae2319bbd969307093787e4dcca..75414620094fc1cc43fec0288ced7dd6b35070da 100644

--- a/sync/internal_api/public/sessions/model_neutral_state.h

+++ b/sync/internal_api/public/sessions/model_neutral_state.h

@@ -60,9 +60,6 @@ struct ModelNeutralState {

SyncerError last_download_updates_result;

SyncerError commit_result;

- // Set to true by ResolveConflictsCommand if any forward progress was made.

- bool conflicts_resolved;

// Set to true by PostCommitMessageCommand if any commits were successful.

bool items_committed;