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

Unified Diff: chrome/browser/extensions/api/storage/syncable_settings_storage.cc

Issue 15701022: [Sync] Add support for sync Persistence Errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move bookmark change into separate patch Created 7 years, 6 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/storage/syncable_settings_storage.cc
diff --git a/chrome/browser/extensions/api/storage/syncable_settings_storage.cc b/chrome/browser/extensions/api/storage/syncable_settings_storage.cc
index 5bfc039926768e35acd5e261fab0e07dc8d23253..66fd94fc247c5e4596211bb8e5a9ff9591377d09 100644
--- a/chrome/browser/extensions/api/storage/syncable_settings_storage.cc
+++ b/chrome/browser/extensions/api/storage/syncable_settings_storage.cc
@@ -141,6 +141,7 @@ syncer::SyncError SyncableSettingsStorage::StartSyncing(
if (maybe_settings->HasError()) {
return syncer::SyncError(
FROM_HERE,
+ syncer::SyncError::DATATYPE_ERROR,
std::string("Failed to get settings: ") + maybe_settings->error(),
sync_processor_->type());
}
@@ -240,6 +241,7 @@ syncer::SyncError SyncableSettingsStorage::ProcessSyncChanges(
if (!sync_processor_.get()) {
return syncer::SyncError(
FROM_HERE,
+ syncer::SyncError::DATATYPE_ERROR,
std::string("Sync is inactive for ") + extension_id_,
syncer::UNSPECIFIED);
}
@@ -260,6 +262,7 @@ syncer::SyncError SyncableSettingsStorage::ProcessSyncChanges(
if (maybe_settings->HasError()) {
errors.push_back(syncer::SyncError(
FROM_HERE,
+ syncer::SyncError::DATATYPE_ERROR,
std::string("Error getting current sync state for ") +
extension_id_ + "/" + key + ": " + maybe_settings->error(),
sync_processor_->type()));
@@ -339,6 +342,7 @@ syncer::SyncError SyncableSettingsStorage::OnSyncAdd(
if (result->HasError()) {
return syncer::SyncError(
FROM_HERE,
+ syncer::SyncError::DATATYPE_ERROR,
std::string("Error pushing sync add to local settings: ") +
result->error(),
sync_processor_->type());
@@ -358,6 +362,7 @@ syncer::SyncError SyncableSettingsStorage::OnSyncUpdate(
if (result->HasError()) {
return syncer::SyncError(
FROM_HERE,
+ syncer::SyncError::DATATYPE_ERROR,
std::string("Error pushing sync update to local settings: ") +
result->error(),
sync_processor_->type());
@@ -375,6 +380,7 @@ syncer::SyncError SyncableSettingsStorage::OnSyncDelete(
if (result->HasError()) {
return syncer::SyncError(
FROM_HERE,
+ syncer::SyncError::DATATYPE_ERROR,
std::string("Error pushing sync remove to local settings: ") +
result->error(),
sync_processor_->type());
« no previous file with comments | « chrome/browser/extensions/api/storage/settings_sync_unittest.cc ('k') | chrome/browser/history/delete_directive_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698