| Index: chrome/browser/sync/glue/non_frontend_data_type_controller.h
|
| diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.h b/chrome/browser/sync/glue/non_frontend_data_type_controller.h
|
| index bcb5b616a12b8fedd735c5046801340004f5ee9e..ad69cd7b4af3822f1546d2a8568fba802d8c9d31 100644
|
| --- a/chrome/browser/sync/glue/non_frontend_data_type_controller.h
|
| +++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.h
|
| @@ -57,18 +57,17 @@ class NonFrontendDataTypeController : public sync_driver::DataTypeController {
|
| ProfileSyncService* sync_service);
|
|
|
| // DataTypeController interface.
|
| - virtual void LoadModels(
|
| - const ModelLoadCallback& model_load_callback) override;
|
| - virtual void StartAssociating(const StartCallback& start_callback) override;
|
| - virtual void Stop() override;
|
| + void LoadModels(const ModelLoadCallback& model_load_callback) override;
|
| + void StartAssociating(const StartCallback& start_callback) override;
|
| + void Stop() override;
|
| virtual syncer::ModelType type() const = 0;
|
| virtual syncer::ModelSafeGroup model_safe_group() const = 0;
|
| - virtual std::string name() const override;
|
| - virtual State state() const override;
|
| + std::string name() const override;
|
| + State state() const override;
|
|
|
| // DataTypeErrorHandler interface.
|
| // Note: this is performed on the datatype's thread.
|
| - virtual void OnSingleDataTypeUnrecoverableError(
|
| + void OnSingleDataTypeUnrecoverableError(
|
| const syncer::SyncError& error) override;
|
|
|
| // Callback to receive background association results.
|
| @@ -91,10 +90,10 @@ class NonFrontendDataTypeController : public sync_driver::DataTypeController {
|
| // For testing only.
|
| NonFrontendDataTypeController();
|
|
|
| - virtual ~NonFrontendDataTypeController();
|
| + ~NonFrontendDataTypeController() override;
|
|
|
| // DataTypeController interface.
|
| - virtual void OnModelLoaded() override;
|
| + void OnModelLoaded() override;
|
|
|
| // Start any dependent services that need to be running before we can
|
| // associate models. The default implementation is a no-op.
|
| @@ -168,7 +167,7 @@ class NonFrontendDataTypeController : public sync_driver::DataTypeController {
|
| void set_state(State state);
|
|
|
| virtual sync_driver::AssociatorInterface* associator() const;
|
| - virtual sync_driver::ChangeProcessor* GetChangeProcessor() const override;
|
| + sync_driver::ChangeProcessor* GetChangeProcessor() const override;
|
|
|
| State state_;
|
| StartCallback start_callback_;
|
|
|