Index: components/sync/driver/backend_data_type_configurer.h |
diff --git a/components/sync/driver/backend_data_type_configurer.h b/components/sync/driver/backend_data_type_configurer.h |
index 8a3208a068942f2430f1f3318d2b78c02bb6fb96..01c087964f54d127e8cb8777598f37ae98e723a5 100644 |
--- a/components/sync/driver/backend_data_type_configurer.h |
+++ b/components/sync/driver/backend_data_type_configurer.h |
@@ -13,10 +13,13 @@ |
#include "components/sync/core/configure_reason.h" |
#include "components/sync/engine/model_safe_worker.h" |
-namespace syncer { |
+namespace syncer_v2 { |
+struct ActivationContext; |
+} |
+ |
+namespace sync_driver { |
class ChangeProcessor; |
-struct ActivationContext; |
// The DataTypeConfigurer interface abstracts out the action of |
// configuring a set of new data types and cleaning up after a set of |
@@ -36,7 +39,8 @@ class BackendDataTypeConfigurer { |
CRYPTO, // Not syncing due to a cryptographer error. |
UNREADY, // Not syncing due to transient error. |
}; |
- typedef std::map<ModelType, DataTypeConfigState> DataTypeConfigStateMap; |
+ typedef std::map<syncer::ModelType, DataTypeConfigState> |
+ DataTypeConfigStateMap; |
// Configures sync for data types in config_state_map according to the states. |
// |ready_task| is called on the same thread as ConfigureDataTypes |
@@ -51,14 +55,15 @@ class BackendDataTypeConfigurer { |
// a pair of callbacks. The awkward part is handling when |
// SyncBackendHost calls ConfigureDataTypes on itself to configure |
// Nigori. |
- virtual ModelTypeSet ConfigureDataTypes( |
- ConfigureReason reason, |
+ virtual syncer::ModelTypeSet ConfigureDataTypes( |
+ syncer::ConfigureReason reason, |
const DataTypeConfigStateMap& config_state_map, |
- const base::Callback<void(ModelTypeSet, ModelTypeSet)>& ready_task, |
+ const base::Callback<void(syncer::ModelTypeSet, syncer::ModelTypeSet)>& |
+ ready_task, |
const base::Callback<void()>& retry_callback) = 0; |
// Return model types in |state_map| that match |state|. |
- static ModelTypeSet GetDataTypesInState( |
+ static syncer::ModelTypeSet GetDataTypesInState( |
DataTypeConfigState state, |
const DataTypeConfigStateMap& state_map); |
@@ -66,31 +71,31 @@ class BackendDataTypeConfigurer { |
// be called synchronously with the data type's model association so |
// no changes are dropped between model association and change |
// processor activation. |
- virtual void ActivateDirectoryDataType(ModelType type, |
- ModelSafeGroup group, |
+ virtual void ActivateDirectoryDataType(syncer::ModelType type, |
+ syncer::ModelSafeGroup group, |
ChangeProcessor* change_processor) = 0; |
// Deactivates change processing for the given data type. |
- virtual void DeactivateDirectoryDataType(ModelType type) = 0; |
+ virtual void DeactivateDirectoryDataType(syncer::ModelType type) = 0; |
// Activates change processing for the given non-blocking data type. |
// This must be called before initial sync for data type. |
virtual void ActivateNonBlockingDataType( |
- ModelType type, |
- std::unique_ptr<ActivationContext> activation_context) = 0; |
+ syncer::ModelType type, |
+ std::unique_ptr<syncer_v2::ActivationContext> activation_context) = 0; |
// Deactivates change processing for the given non-blocking data type. |
- virtual void DeactivateNonBlockingDataType(ModelType type) = 0; |
+ virtual void DeactivateNonBlockingDataType(syncer::ModelType type) = 0; |
// Set state of |types| in |state_map| to |state|. |
static void SetDataTypesState(DataTypeConfigState state, |
- ModelTypeSet types, |
+ syncer::ModelTypeSet types, |
DataTypeConfigStateMap* state_map); |
protected: |
virtual ~BackendDataTypeConfigurer() {} |
}; |
-} // namespace syncer |
+} // namespace sync_driver |
#endif // COMPONENTS_SYNC_DRIVER_BACKEND_DATA_TYPE_CONFIGURER_H_ |