| Index: sync/engine/model_type_sync_worker_impl.h
|
| diff --git a/sync/engine/model_type_sync_worker_impl.h b/sync/engine/model_type_sync_worker_impl.h
|
| index 1116adeca64f468c8b7a0322dad84902608466af..30015697f3fe714dda83825834f762e09a501ecf 100644
|
| --- a/sync/engine/model_type_sync_worker_impl.h
|
| +++ b/sync/engine/model_type_sync_worker_impl.h
|
| @@ -59,7 +59,7 @@ class SYNC_EXPORT ModelTypeSyncWorkerImpl : public UpdateHandler,
|
| scoped_ptr<Cryptographer> cryptographer,
|
| NudgeHandler* nudge_handler,
|
| scoped_ptr<ModelTypeSyncProxy> type_sync_proxy);
|
| - virtual ~ModelTypeSyncWorkerImpl();
|
| + ~ModelTypeSyncWorkerImpl() override;
|
|
|
| ModelType GetModelType() const;
|
|
|
| @@ -67,25 +67,22 @@ class SYNC_EXPORT ModelTypeSyncWorkerImpl : public UpdateHandler,
|
| void UpdateCryptographer(scoped_ptr<Cryptographer> cryptographer);
|
|
|
| // UpdateHandler implementation.
|
| - virtual void GetDownloadProgress(
|
| + void GetDownloadProgress(
|
| sync_pb::DataTypeProgressMarker* progress_marker) const override;
|
| - virtual void GetDataTypeContext(
|
| - sync_pb::DataTypeContext* context) const override;
|
| - virtual SyncerError ProcessGetUpdatesResponse(
|
| + void GetDataTypeContext(sync_pb::DataTypeContext* context) const override;
|
| + SyncerError ProcessGetUpdatesResponse(
|
| const sync_pb::DataTypeProgressMarker& progress_marker,
|
| const sync_pb::DataTypeContext& mutated_context,
|
| const SyncEntityList& applicable_updates,
|
| sessions::StatusController* status) override;
|
| - virtual void ApplyUpdates(sessions::StatusController* status) override;
|
| - virtual void PassiveApplyUpdates(sessions::StatusController* status) override;
|
| + void ApplyUpdates(sessions::StatusController* status) override;
|
| + void PassiveApplyUpdates(sessions::StatusController* status) override;
|
|
|
| // ModelTypeSyncWorker implementation.
|
| - virtual void EnqueueForCommit(
|
| - const CommitRequestDataList& request_list) override;
|
| + void EnqueueForCommit(const CommitRequestDataList& request_list) override;
|
|
|
| // CommitContributor implementation.
|
| - virtual scoped_ptr<CommitContribution> GetContribution(
|
| - size_t max_entries) override;
|
| + scoped_ptr<CommitContribution> GetContribution(size_t max_entries) override;
|
|
|
| // Callback for when our contribution gets a response.
|
| void OnCommitResponse(const CommitResponseDataList& response_list);
|
|
|