Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Side by Side 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, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sync/engine/all_status.cc ('k') | sync/engine/nudge_source.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef SYNC_ENGINE_NUDGE_SOURCE_H_ 5 #ifndef SYNC_ENGINE_NUDGE_SOURCE_H_
6 #define SYNC_ENGINE_NUDGE_SOURCE_H_ 6 #define SYNC_ENGINE_NUDGE_SOURCE_H_
7 7
8 namespace syncer { 8 namespace syncer {
9 9
10 enum NudgeSource { 10 enum NudgeSource {
11 NUDGE_SOURCE_UNKNOWN = 0, 11 NUDGE_SOURCE_UNKNOWN = 0,
12 // We received an invalidation message and are nudging to check for updates. 12 // We received an invalidation message and are nudging to check for updates.
13 NUDGE_SOURCE_NOTIFICATION, 13 NUDGE_SOURCE_NOTIFICATION,
14 // A local change occurred (e.g. bookmark moved). 14 // A local change occurred (e.g. bookmark moved).
15 NUDGE_SOURCE_LOCAL, 15 NUDGE_SOURCE_LOCAL,
16 // A previous sync cycle did not fully complete (e.g. HTTP error).
17 NUDGE_SOURCE_CONTINUATION,
18 // A local event is triggering an optimistic datatype refresh. 16 // A local event is triggering an optimistic datatype refresh.
19 NUDGE_SOURCE_LOCAL_REFRESH, 17 NUDGE_SOURCE_LOCAL_REFRESH,
20 }; 18 };
21 19
22 const char* GetNudgeSourceString(NudgeSource nudge_source); 20 const char* GetNudgeSourceString(NudgeSource nudge_source);
23 21
24 } // namespace syncer 22 } // namespace syncer
25 23
26 #endif // SYNC_ENGINE_NUDGE_SOURCE_H_ 24 #endif // SYNC_ENGINE_NUDGE_SOURCE_H_
OLDNEW
« no previous file with comments | « sync/engine/all_status.cc ('k') | sync/engine/nudge_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698