chrome/browser/sync/sessions/status_controller.cc - Issue 9305001: sync: Remove the remaining conflict sets 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 9305001: sync: Remove the remaining conflict sets code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Additional comments 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 95c8c4f64c68db93dc6fdf51a8a0bc3832bfa77b..10f2c17c932288e42e6d6f5d833d7663da1dd2d5 100644

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

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

@@ -284,6 +284,7 @@ int StatusController::TotalNumConflictingItems() const {

for (; it != per_model_group_.end(); ++it) {

sum += it->second->conflict_progress.ConflictingItemsSize();

sum += it->second->conflict_progress.NonblockingConflictingItemsSize();

+ sum += it->second->conflict_progress.HierarchyConflictingItemsSize();

}

return sum;

}