chrome/browser/sync/sessions/sync_session.cc - Issue 9107055: Remove single direction conflict set code

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: chrome/browser/sync/sessions/sync_session.cc

Issue 9107055: Remove single direction conflict set code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Pre-emptive rebase Created 8 years, 11 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: chrome/browser/sync/sessions/sync_session.cc

diff --git a/chrome/browser/sync/sessions/sync_session.cc b/chrome/browser/sync/sessions/sync_session.cc

index b0b53b4cde81a17476b517322edcdf97fbfda84f..47ca7b1ff034896482f2a9af69ec53aa609a3d9b 100644

--- a/chrome/browser/sync/sessions/sync_session.cc

+++ b/chrome/browser/sync/sessions/sync_session.cc

@@ -189,7 +189,6 @@ bool SyncSession::HasMoreToSync() const {

const StatusController* status = status_controller_.get();

return ((status->commit_ids().size() < status->unsynced_handles().size()) &&

status->syncer_status().num_successful_commits > 0) ||

- status->conflict_sets_built() ||

status->conflicts_resolved();

// Or, we have conflicting updates, but we're making progress on

// resolving them...