summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/public
diff options
context:
space:
mode:
authorhaitaol@chromium.org <haitaol@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-22 01:04:08 +0000
committerhaitaol@chromium.org <haitaol@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-22 01:04:08 +0000
commitce7399ac8cb2355d80a71a3ac860b53fa15ff1f8 (patch)
treec7672724594566068416760c7cd32cb48e41da64 /sync/internal_api/public
parent185fa85d78c5f8443faf455c10748cb7b0a4d4ed (diff)
downloadchromium_src-ce7399ac8cb2355d80a71a3ac860b53fa15ff1f8.zip
chromium_src-ce7399ac8cb2355d80a71a3ac860b53fa15ff1f8.tar.gz
chromium_src-ce7399ac8cb2355d80a71a3ac860b53fa15ff1f8.tar.bz2
Add an action for server to send down rollback command.
BUG=362679 Review URL: https://codereview.chromium.org/238273008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/public')
-rw-r--r--sync/internal_api/public/util/syncer_error.cc1
-rw-r--r--sync/internal_api/public/util/syncer_error.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/sync/internal_api/public/util/syncer_error.cc b/sync/internal_api/public/util/syncer_error.cc
index 81805d2..8130b1e 100644
--- a/sync/internal_api/public/util/syncer_error.cc
+++ b/sync/internal_api/public/util/syncer_error.cc
@@ -27,6 +27,7 @@ const char* GetSyncerErrorString(SyncerError value) {
ENUM_CASE(SERVER_RETURN_CONFLICT);
ENUM_CASE(SERVER_RESPONSE_VALIDATION_FAILED);
ENUM_CASE(SERVER_RETURN_DISABLED_BY_ADMIN);
+ ENUM_CASE(SERVER_RETURN_USER_ROLLBACK);
ENUM_CASE(SERVER_MORE_TO_DOWNLOAD);
ENUM_CASE(DATATYPE_TRIGGERED_RETRY);
ENUM_CASE(SYNCER_OK);
diff --git a/sync/internal_api/public/util/syncer_error.h b/sync/internal_api/public/util/syncer_error.h
index 1a5ec79..05ad963 100644
--- a/sync/internal_api/public/util/syncer_error.h
+++ b/sync/internal_api/public/util/syncer_error.h
@@ -30,6 +30,7 @@ enum SYNC_EXPORT_PRIVATE SyncerError {
SERVER_RETURN_CONFLICT,
SERVER_RESPONSE_VALIDATION_FAILED,
SERVER_RETURN_DISABLED_BY_ADMIN,
+ SERVER_RETURN_USER_ROLLBACK,
// A datatype decided the sync cycle needed to be performed again.
DATATYPE_TRIGGERED_RETRY,