| Index: components/sync_driver/device_info_sync_service.h
|
| diff --git a/components/sync_driver/device_info_sync_service.h b/components/sync_driver/device_info_sync_service.h
|
| index eb636bedc9b2d4f1dceb74d398d3bb3ba8ea3bb1..a214fc0482374553bb6fdc4028dcd721a9c4dfc0 100644
|
| --- a/components/sync_driver/device_info_sync_service.h
|
| +++ b/components/sync_driver/device_info_sync_service.h
|
| @@ -22,27 +22,26 @@ class DeviceInfoSyncService : public syncer::SyncableService,
|
| public:
|
| explicit DeviceInfoSyncService(
|
| LocalDeviceInfoProvider* local_device_info_provider);
|
| - virtual ~DeviceInfoSyncService();
|
| + ~DeviceInfoSyncService() override;
|
|
|
| // syncer::SyncableService implementation.
|
| - virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
|
| + syncer::SyncMergeResult MergeDataAndStartSyncing(
|
| syncer::ModelType type,
|
| const syncer::SyncDataList& initial_sync_data,
|
| scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
|
| scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
|
| - virtual void StopSyncing(syncer::ModelType type) override;
|
| - virtual syncer::SyncDataList GetAllSyncData(
|
| - syncer::ModelType type) const override;
|
| - virtual syncer::SyncError ProcessSyncChanges(
|
| + void StopSyncing(syncer::ModelType type) override;
|
| + syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
|
| + syncer::SyncError ProcessSyncChanges(
|
| const tracked_objects::Location& from_here,
|
| const syncer::SyncChangeList& change_list) override;
|
|
|
| // DeviceInfoTracker implementation.
|
| - virtual scoped_ptr<DeviceInfo> GetDeviceInfo(
|
| + scoped_ptr<DeviceInfo> GetDeviceInfo(
|
| const std::string& client_id) const override;
|
| - virtual ScopedVector<DeviceInfo> GetAllDeviceInfo() const override;
|
| - virtual void AddObserver(Observer* observer) override;
|
| - virtual void RemoveObserver(Observer* observer) override;
|
| + ScopedVector<DeviceInfo> GetAllDeviceInfo() const override;
|
| + void AddObserver(Observer* observer) override;
|
| + void RemoveObserver(Observer* observer) override;
|
|
|
| // Called to update local device backup time.
|
| void UpdateLocalDeviceBackupTime(base::Time backup_time);
|
|
|