| Index: components/sync_driver/ui_data_type_controller.h
|
| diff --git a/components/sync_driver/ui_data_type_controller.h b/components/sync_driver/ui_data_type_controller.h
|
| index 30289919e84c140261d501ae7bd2ca906715f186..dc45de9719bce34f483f6971b3806f2198356801 100644
|
| --- a/components/sync_driver/ui_data_type_controller.h
|
| +++ b/components/sync_driver/ui_data_type_controller.h
|
| @@ -39,18 +39,18 @@ class UIDataTypeController : public DataTypeController {
|
|
|
| // DataTypeController interface.
|
| virtual void LoadModels(
|
| - const ModelLoadCallback& model_load_callback) OVERRIDE;
|
| - virtual void StartAssociating(const StartCallback& start_callback) OVERRIDE;
|
| - virtual void Stop() OVERRIDE;
|
| - virtual syncer::ModelType type() const OVERRIDE;
|
| - virtual syncer::ModelSafeGroup model_safe_group() const OVERRIDE;
|
| - virtual ChangeProcessor* GetChangeProcessor() const OVERRIDE;
|
| - virtual std::string name() const OVERRIDE;
|
| - virtual State state() const OVERRIDE;
|
| + const ModelLoadCallback& model_load_callback) override;
|
| + virtual void StartAssociating(const StartCallback& start_callback) override;
|
| + virtual void Stop() override;
|
| + virtual syncer::ModelType type() const override;
|
| + virtual syncer::ModelSafeGroup model_safe_group() const override;
|
| + virtual ChangeProcessor* GetChangeProcessor() const override;
|
| + virtual std::string name() const override;
|
| + virtual State state() const override;
|
|
|
| // DataTypeErrorHandler interface.
|
| virtual void OnSingleDataTypeUnrecoverableError(
|
| - const syncer::SyncError& error) OVERRIDE;
|
| + const syncer::SyncError& error) override;
|
|
|
| // Used by tests to override the factory used to create
|
| // GenericChangeProcessors.
|
| @@ -76,7 +76,7 @@ class UIDataTypeController : public DataTypeController {
|
| virtual void StopModels();
|
|
|
| // DataTypeController interface.
|
| - virtual void OnModelLoaded() OVERRIDE;
|
| + virtual void OnModelLoaded() override;
|
|
|
| // Helper method for cleaning up state and invoking the start callback.
|
| virtual void StartDone(ConfigureResult result,
|
|
|