sync/engine/nudge_source.h - Issue 11314008: sync: Follow-up to conflict resolution refactor

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: sync/engine/nudge_source.h

Issue 11314008: sync: Follow-up to conflict resolution refactor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix tests Created 8 years, 2 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: sync/engine/nudge_source.h

diff --git a/sync/engine/nudge_source.h b/sync/engine/nudge_source.h

index 366f6d14247de042d59aa72fe57b1521ebe66400..d60b51558defb38f6b14d9dc9ba3b70aa8b00b95 100644

--- a/sync/engine/nudge_source.h

+++ b/sync/engine/nudge_source.h

@@ -13,8 +13,6 @@ enum NudgeSource {

NUDGE_SOURCE_NOTIFICATION,

// A local change occurred (e.g. bookmark moved).

NUDGE_SOURCE_LOCAL,

- // A previous sync cycle did not fully complete (e.g. HTTP error).

- NUDGE_SOURCE_CONTINUATION,

// A local event is triggering an optimistic datatype refresh.

NUDGE_SOURCE_LOCAL_REFRESH,

};

« no previous file with comments | « sync/engine/all_status.cc ('k') | sync/engine/nudge_source.cc » ('j') | no next file with comments »