summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history/delete_directive_handler.cc
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 23:24:04 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 23:24:04 +0000
commit651da6252ac3c36ec5d85b338f1fb0df16e940f4 (patch)
treef6e0920e4ae4dfbd3df67d557cf0d228e168c030 /chrome/browser/history/delete_directive_handler.cc
parent67825502bb43b8549b4d50e5ee414ec5be66db9c (diff)
downloadchromium_src-651da6252ac3c36ec5d85b338f1fb0df16e940f4.zip
chromium_src-651da6252ac3c36ec5d85b338f1fb0df16e940f4.tar.gz
chromium_src-651da6252ac3c36ec5d85b338f1fb0df16e940f4.tar.bz2
[Sync] Add support for sync Persistence Errors
Persistence errors are those detected by the native model's transaction version being newer than sync's. They currently have no effect beyond a normal association error, but will eventually result in delayed association after a sync update. BUG=239828 TBR=atwilson@chromium.org, sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/15701022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/delete_directive_handler.cc')
-rw-r--r--chrome/browser/history/delete_directive_handler.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/history/delete_directive_handler.cc b/chrome/browser/history/delete_directive_handler.cc
index 16ed55b..c08bf77 100644
--- a/chrome/browser/history/delete_directive_handler.cc
+++ b/chrome/browser/history/delete_directive_handler.cc
@@ -344,6 +344,7 @@ syncer::SyncError DeleteDirectiveHandler::ProcessLocalDeleteDirective(
if (!sync_processor_) {
return syncer::SyncError(
FROM_HERE,
+ syncer::SyncError::DATATYPE_ERROR,
"Cannot send local delete directive to sync",
syncer::HISTORY_DELETE_DIRECTIVES);
}
@@ -372,7 +373,10 @@ syncer::SyncError DeleteDirectiveHandler::ProcessSyncChanges(
DCHECK(thread_checker_.CalledOnValidThread());
if (!sync_processor_) {
return syncer::SyncError(
- FROM_HERE, "Sync is disabled.", syncer::HISTORY_DELETE_DIRECTIVES);
+ FROM_HERE,
+ syncer::SyncError::DATATYPE_ERROR,
+ "Sync is disabled.",
+ syncer::HISTORY_DELETE_DIRECTIVES);
}
syncer::SyncDataList delete_directives;