| 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 dc45de9719bce34f483f6971b3806f2198356801..dcade3794cca8cf57cec62c8c4a01e3158a76f95 100644
|
| --- a/components/sync_driver/ui_data_type_controller.h
|
| +++ b/components/sync_driver/ui_data_type_controller.h
|
| @@ -38,18 +38,17 @@ class UIDataTypeController : public DataTypeController {
|
| SyncApiComponentFactory* sync_factory);
|
|
|
| // 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;
|
| + void LoadModels(const ModelLoadCallback& model_load_callback) override;
|
| + void StartAssociating(const StartCallback& start_callback) override;
|
| + void Stop() override;
|
| + syncer::ModelType type() const override;
|
| + syncer::ModelSafeGroup model_safe_group() const override;
|
| + ChangeProcessor* GetChangeProcessor() const override;
|
| + std::string name() const override;
|
| + State state() const override;
|
|
|
| // DataTypeErrorHandler interface.
|
| - virtual void OnSingleDataTypeUnrecoverableError(
|
| + void OnSingleDataTypeUnrecoverableError(
|
| const syncer::SyncError& error) override;
|
|
|
| // Used by tests to override the factory used to create
|
| @@ -61,7 +60,7 @@ class UIDataTypeController : public DataTypeController {
|
| // For testing only.
|
| UIDataTypeController();
|
| // DataTypeController is RefCounted.
|
| - virtual ~UIDataTypeController();
|
| + ~UIDataTypeController() override;
|
|
|
| // Start any dependent services that need to be running before we can
|
| // associate models. The default implementation is a no-op.
|
| @@ -76,7 +75,7 @@ class UIDataTypeController : public DataTypeController {
|
| virtual void StopModels();
|
|
|
| // DataTypeController interface.
|
| - virtual void OnModelLoaded() override;
|
| + void OnModelLoaded() override;
|
|
|
| // Helper method for cleaning up state and invoking the start callback.
|
| virtual void StartDone(ConfigureResult result,
|
|
|