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

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

index 13371dd6c057829881c54e8c15e630bd3d01524d..95c8c4f64c68db93dc6fdf51a8a0bc3832bfa77b 100644

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

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

@@ -225,9 +225,6 @@ void StatusController::set_commit_set(const OrderedCommitSet& commit_set) {

shared_.commit_set = commit_set;

}

-void StatusController::update_conflict_sets_built(bool built) {

- shared_.control_params.conflict_sets_built |= built;

void StatusController::update_conflicts_resolved(bool resolved) {

shared_.control_params.conflicts_resolved |= resolved;

}