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

Unified Diff: components/sync/driver/data_type_manager_impl.cc

Issue 2533083002: [Sync] SyncEngine refactor part 1: interfaces. (Closed)
Patch Set: Rebase. Created 4 years 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: components/sync/driver/data_type_manager_impl.cc
diff --git a/components/sync/driver/data_type_manager_impl.cc b/components/sync/driver/data_type_manager_impl.cc
index c747405120cb86409966a2491b8ae483ec9bd7b3..a449da4ba91f6cac40a693653181cc3d1b9210af 100644
--- a/components/sync/driver/data_type_manager_impl.cc
+++ b/components/sync/driver/data_type_manager_impl.cc
@@ -47,7 +47,7 @@ DataTypeManagerImpl::DataTypeManagerImpl(
const WeakHandle<DataTypeDebugInfoListener>& debug_info_listener,
const DataTypeController::TypeMap* controllers,
const DataTypeEncryptionHandler* encryption_handler,
- BackendDataTypeConfigurer* configurer,
+ ModelTypeConfigurer* configurer,
DataTypeManagerObserver* observer)
: configurer_(configurer),
controllers_(controllers),
@@ -164,7 +164,7 @@ void DataTypeManagerImpl::RegisterTypesWithBackend() {
}
}
-BackendDataTypeConfigurer::DataTypeConfigStateMap
+ModelTypeConfigurer::DataTypeConfigStateMap
DataTypeManagerImpl::BuildDataTypeConfigStateMap(
const ModelTypeSet& types_being_configured) const {
// 1. Get the failed types (due to fatal, crypto, and unready errors).
@@ -201,24 +201,22 @@ DataTypeManagerImpl::BuildDataTypeConfigStateMap(
DVLOG(1) << "Configuring: " << ModelTypeSetToString(to_configure);
DVLOG(1) << "Disabling: " << ModelTypeSetToString(disabled_types);
- BackendDataTypeConfigurer::DataTypeConfigStateMap config_state_map;
- BackendDataTypeConfigurer::SetDataTypesState(
- BackendDataTypeConfigurer::CONFIGURE_INACTIVE, enabled_types,
+ ModelTypeConfigurer::DataTypeConfigStateMap config_state_map;
+ ModelTypeConfigurer::SetDataTypesState(
+ ModelTypeConfigurer::CONFIGURE_INACTIVE, enabled_types,
&config_state_map);
- BackendDataTypeConfigurer::SetDataTypesState(
- BackendDataTypeConfigurer::CONFIGURE_ACTIVE, to_configure,
- &config_state_map);
- BackendDataTypeConfigurer::SetDataTypesState(
- BackendDataTypeConfigurer::CONFIGURE_CLEAN, clean_types,
- &config_state_map);
- BackendDataTypeConfigurer::SetDataTypesState(
- BackendDataTypeConfigurer::DISABLED, disabled_types, &config_state_map);
- BackendDataTypeConfigurer::SetDataTypesState(BackendDataTypeConfigurer::FATAL,
- fatal_types, &config_state_map);
- BackendDataTypeConfigurer::SetDataTypesState(
- BackendDataTypeConfigurer::CRYPTO, crypto_types, &config_state_map);
- BackendDataTypeConfigurer::SetDataTypesState(
- BackendDataTypeConfigurer::UNREADY, unready_types, &config_state_map);
+ ModelTypeConfigurer::SetDataTypesState(ModelTypeConfigurer::CONFIGURE_ACTIVE,
+ to_configure, &config_state_map);
+ ModelTypeConfigurer::SetDataTypesState(ModelTypeConfigurer::CONFIGURE_CLEAN,
+ clean_types, &config_state_map);
+ ModelTypeConfigurer::SetDataTypesState(ModelTypeConfigurer::DISABLED,
+ disabled_types, &config_state_map);
+ ModelTypeConfigurer::SetDataTypesState(ModelTypeConfigurer::FATAL,
+ fatal_types, &config_state_map);
+ ModelTypeConfigurer::SetDataTypesState(ModelTypeConfigurer::CRYPTO,
+ crypto_types, &config_state_map);
+ ModelTypeConfigurer::SetDataTypesState(ModelTypeConfigurer::UNREADY,
+ unready_types, &config_state_map);
return config_state_map;
}
« no previous file with comments | « components/sync/driver/data_type_manager_impl.h ('k') | components/sync/driver/data_type_manager_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698