chrome/browser/sync/sessions/session_state.h - Issue 8922015: [Sync] Don't commit items with predecessors/parents in conflict.

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/session_state.h

Issue 8922015: [Sync] Don't commit items with predecessors/parents in conflict. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Ensure we clear BASE_SERVER_SPECIFICS Created 9 years 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/session_state.h

diff --git a/chrome/browser/sync/sessions/session_state.h b/chrome/browser/sync/sessions/session_state.h

index 448ecc1cd28cee74ac3fbad82786868ba9d1324b..4faf97dac07f1325d34eb8beef519b3caec844c2 100644

--- a/chrome/browser/sync/sessions/session_state.h

+++ b/chrome/browser/sync/sessions/session_state.h

@@ -171,6 +171,7 @@ class ConflictProgress {

std::set<ConflictSet*>::const_iterator ConflictSetsBegin() const;

std::set<ConflictSet*>::const_iterator ConflictSetsEnd() const;

std::set<ConflictSet*>::size_type ConflictSetsSize() const;

+ bool HasSimpleConflictItem(const syncable::Id& id) const;

// Various mutators for tracking commit conflicts.

void AddConflictingItemById(const syncable::Id& the_id);