| Index: components/sync/driver/data_type_controller.h
|
| diff --git a/components/sync_driver/data_type_controller.h b/components/sync/driver/data_type_controller.h
|
| similarity index 96%
|
| rename from components/sync_driver/data_type_controller.h
|
| rename to components/sync/driver/data_type_controller.h
|
| index 2d9f70b36ac420352ad048174e893ce264a9cd71..7035b5dcb78b8dc994a0c4529f7368b64a008558 100644
|
| --- a/components/sync_driver/data_type_controller.h
|
| +++ b/components/sync/driver/data_type_controller.h
|
| @@ -70,13 +70,14 @@ class DataTypeController
|
|
|
| typedef base::Callback<void(ConfigureResult,
|
| const syncer::SyncMergeResult&,
|
| - const syncer::SyncMergeResult&)> StartCallback;
|
| + const syncer::SyncMergeResult&)>
|
| + StartCallback;
|
|
|
| - typedef base::Callback<void(syncer::ModelType,
|
| - syncer::SyncError)> ModelLoadCallback;
|
| + typedef base::Callback<void(syncer::ModelType, syncer::SyncError)>
|
| + ModelLoadCallback;
|
|
|
| - typedef std::map<syncer::ModelType,
|
| - scoped_refptr<DataTypeController> > TypeMap;
|
| + typedef std::map<syncer::ModelType, scoped_refptr<DataTypeController>>
|
| + TypeMap;
|
| typedef std::map<syncer::ModelType, DataTypeController::State> StateMap;
|
|
|
| // Returns true if the start result should trigger an unrecoverable error.
|
|
|