| Index: components/sync/driver/data_type_manager_impl.h
|
| diff --git a/components/sync_driver/data_type_manager_impl.h b/components/sync/driver/data_type_manager_impl.h
|
| similarity index 96%
|
| rename from components/sync_driver/data_type_manager_impl.h
|
| rename to components/sync/driver/data_type_manager_impl.h
|
| index 781d4f391a23cb0400276335a053fe42944737da..27d9da4418d5ae75f042b66dfda576c2a1dfcd51 100644
|
| --- a/components/sync_driver/data_type_manager_impl.h
|
| +++ b/components/sync/driver/data_type_manager_impl.h
|
| @@ -5,7 +5,7 @@
|
| #ifndef COMPONENTS_SYNC_DRIVER_DATA_TYPE_MANAGER_IMPL_H__
|
| #define COMPONENTS_SYNC_DRIVER_DATA_TYPE_MANAGER_IMPL_H__
|
|
|
| -#include "components/sync_driver/data_type_manager.h"
|
| +#include "components/sync/driver/data_type_manager.h"
|
|
|
| #include <map>
|
| #include <queue>
|
| @@ -16,13 +16,14 @@
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/time.h"
|
| -#include "components/sync_driver/backend_data_type_configurer.h"
|
| -#include "components/sync_driver/model_association_manager.h"
|
| +#include "components/sync/driver/backend_data_type_configurer.h"
|
| +#include "components/sync/driver/model_association_manager.h"
|
|
|
| namespace syncer {
|
| struct DataTypeConfigurationStats;
|
| class DataTypeDebugInfoListener;
|
| -template <typename T> class WeakHandle;
|
| +template <typename T>
|
| +class WeakHandle;
|
| }
|
|
|
| namespace sync_driver {
|
| @@ -128,8 +129,7 @@ class DataTypeManagerImpl : public DataTypeManager,
|
| // Calls data type controllers of requested types to register with backend.
|
| void RegisterTypesWithBackend();
|
|
|
| - BackendDataTypeConfigurer::DataTypeConfigStateMap
|
| - BuildDataTypeConfigStateMap(
|
| + BackendDataTypeConfigurer::DataTypeConfigStateMap BuildDataTypeConfigStateMap(
|
| const syncer::ModelTypeSet& types_being_configured) const;
|
|
|
| // Start download of next set of types in |download_types_queue_| (if
|
|
|