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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/internal_api/public/util/syncer_error.h

Issue 11411041: sync: Retry soon when server returns conflict (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« sync/engine/backoff_delay_provider.cc ('K') | « sync/engine/process_commit_response_command.cc ('k') | sync/internal_api/public/util/syncer_error.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/public/util/syncer_error.h
diff --git a/sync/internal_api/public/util/syncer_error.h b/sync/internal_api/public/util/syncer_error.h
index 478d8880d4f25d69cbb6e7f2a40cd888f139f509..4e70dc13549af56280121f09b251d5e852b8f56d 100644
--- a/sync/internal_api/public/util/syncer_error.h
+++ b/sync/internal_api/public/util/syncer_error.h
@@ -18,7 +18,6 @@ namespace syncer {
// it makes refactoring easier.
enum SyncerError {
UNSET = 0, // Default value.
- DIRECTORY_LOOKUP_FAILED, // Local directory lookup failure.
CANNOT_DO_WORK, // A model worker could not process a work item.
NETWORK_CONNECTION_UNAVAILABLE, // Connectivity failure.
@@ -36,6 +35,7 @@ enum SyncerError {
SERVER_RETURN_MIGRATION_DONE,
SERVER_RETURN_CLEAR_PENDING,
SERVER_RETURN_NOT_MY_BIRTHDAY,
+ SERVER_RETURN_CONFLICT,
SERVER_RESPONSE_VALIDATION_FAILED,
SYNCER_OK
« sync/engine/backoff_delay_provider.cc ('K') | « sync/engine/process_commit_response_command.cc ('k') | sync/internal_api/public/util/syncer_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698