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

Unified Diff: components/sync_driver/data_type_manager.cc

Issue 420633002: [Sync] Cleanup datatype configuration error handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile Created 6 years, 4 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
« no previous file with comments | « components/sync_driver/data_type_manager.h ('k') | components/sync_driver/data_type_manager_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync_driver/data_type_manager.cc
diff --git a/components/sync_driver/data_type_manager.cc b/components/sync_driver/data_type_manager.cc
index 433d5ca160e647378859469edc9f380c3d913ac8..99dc70ae5edd64c2e0ff7ca114ec918e26168725 100644
--- a/components/sync_driver/data_type_manager.cc
+++ b/components/sync_driver/data_type_manager.cc
@@ -10,25 +10,10 @@ DataTypeManager::ConfigureResult::ConfigureResult()
: status(UNKNOWN) {
}
-DataTypeManager::ConfigureResult::ConfigureResult(ConfigureStatus status,
- syncer::ModelTypeSet
- requested_types)
- : status(status),
- requested_types(requested_types) {
- DCHECK_EQ(OK, status);
-}
-
DataTypeManager::ConfigureResult::ConfigureResult(
ConfigureStatus status,
- syncer::ModelTypeSet requested_types,
- std::map<syncer::ModelType, syncer::SyncError> failed_data_types,
- syncer::ModelTypeSet unfinished_data_types,
- syncer::ModelTypeSet needs_crypto)
- : status(status),
- requested_types(requested_types),
- failed_data_types(failed_data_types),
- unfinished_data_types(unfinished_data_types),
- needs_crypto(needs_crypto) {
+ syncer::ModelTypeSet requested_types)
+ : status(status), requested_types(requested_types) {
}
DataTypeManager::ConfigureResult::~ConfigureResult() {
@@ -43,12 +28,11 @@ std::string DataTypeManager::ConfigureStatusToString(ConfigureStatus status) {
return "Aborted";
case UNRECOVERABLE_ERROR:
return "Unrecoverable Error";
- case PARTIAL_SUCCESS:
- return "Partial Success";
- default:
+ case UNKNOWN:
NOTREACHED();
return std::string();
}
+ return std::string();
}
} // namespace sync_driver
« no previous file with comments | « components/sync_driver/data_type_manager.h ('k') | components/sync_driver/data_type_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698