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

Unified Diff: chrome/browser/sync/profile_sync_service.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/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 8a61a2ee48a8f9cfb70e1d78f14fed26dafa136d..26f26d14cb57137657cd3840e6880d57cd5ff821 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -860,16 +860,17 @@ void ProfileSyncService::DisableBrokenDatatype(
// passed onto the change processor.
DeactivateDataType(type);
- syncer::SyncError error(from_here, message, type);
+ syncer::SyncError error(from_here,
+ syncer::SyncError::DATATYPE_ERROR,
+ message,
+ type);
std::map<syncer::ModelType, syncer::SyncError> errors;
errors[type] = error;
// Update this before posting a task. So if a configure happens before
// the task that we are going to post, this type would still be disabled.
- failed_data_types_handler_.UpdateFailedDataTypes(
- errors,
- FailedDataTypesHandler::RUNTIME);
+ failed_data_types_handler_.UpdateFailedDataTypes(errors);
base::MessageLoop::current()->PostTask(FROM_HERE,
base::Bind(&ProfileSyncService::ReconfigureDatatypeManager,
@@ -1277,7 +1278,7 @@ void ProfileSyncService::OnConfigureDone(
std::string message =
"Sync configuration failed with status " +
DataTypeManager::ConfigureStatusToString(configure_status_) +
- " during " + syncer::ModelTypeToString(error.type()) +
+ " during " + syncer::ModelTypeToString(error.model_type()) +
": " + error.message();
LOG(ERROR) << "ProfileSyncService error: " << message;
OnInternalUnrecoverableError(error.location(),

Powered by Google App Engine
This is Rietveld 408576698