| Index: chrome/browser/sync/glue/ui_data_type_controller.h
|
| diff --git a/chrome/browser/sync/glue/ui_data_type_controller.h b/chrome/browser/sync/glue/ui_data_type_controller.h
|
| index 9bbc7536cd053d73134250c0d0c6ccfe377a2ad0..b237f54cc687db2e6bce2aa18ebe6a594016d478 100644
|
| --- a/chrome/browser/sync/glue/ui_data_type_controller.h
|
| +++ b/chrome/browser/sync/glue/ui_data_type_controller.h
|
| @@ -37,7 +37,7 @@ namespace browser_sync {
|
| class UIDataTypeController : public DataTypeController {
|
| public:
|
| UIDataTypeController(
|
| - syncable::ModelType type,
|
| + syncer::ModelType type,
|
| ProfileSyncComponentsFactory* profile_sync_factory,
|
| Profile* profile,
|
| ProfileSyncService* sync_service);
|
| @@ -47,7 +47,7 @@ class UIDataTypeController : public DataTypeController {
|
| const ModelLoadCallback& model_load_callback) OVERRIDE;
|
| virtual void StartAssociating(const StartCallback& start_callback) OVERRIDE;
|
| virtual void Stop() OVERRIDE;
|
| - virtual syncable::ModelType type() const OVERRIDE;
|
| + virtual syncer::ModelType type() const OVERRIDE;
|
| virtual syncer::ModelSafeGroup model_safe_group() const OVERRIDE;
|
| virtual std::string name() const OVERRIDE;
|
| virtual State state() const OVERRIDE;
|
| @@ -97,7 +97,7 @@ class UIDataTypeController : public DataTypeController {
|
| ModelLoadCallback model_load_callback_;
|
|
|
| // The sync datatype being controlled.
|
| - syncable::ModelType type_;
|
| + syncer::ModelType type_;
|
|
|
| // Sync's interface to the datatype. All sync changes for |type_| are pushed
|
| // through it to the datatype as well as vice versa.
|
|
|