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

Issue 9305001: sync: Remove the remaining conflict sets code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Review updates and renames 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 a1cea483b1562e9cdbbb16c877ada86d50ca7746..91047107c981bb265f55d1542b5b1fd958fe6eb7 100644

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

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

@@ -207,8 +207,8 @@ std::set<ModelSafeGroup> SyncSession::GetEnabledGroupsWithConflicts() const {

const sessions::ConflictProgress* conflict_progress =

status_controller_->GetUnrestrictedConflictProgress(*it);

if (conflict_progress &&

- (conflict_progress->ConflictingItemsBegin() !=

- conflict_progress->ConflictingItemsEnd())) {

+ (conflict_progress->SimpleConflictingItemsBegin() !=

+ conflict_progress->SimpleConflictingItemsEnd())) {

enabled_groups_with_conflicts.insert(*it);

}