| Index: chrome/browser/supervised_user/supervised_user_sync_service.h
|
| diff --git a/chrome/browser/supervised_user/supervised_user_sync_service.h b/chrome/browser/supervised_user/supervised_user_sync_service.h
|
| index dd8bc50772f2905ca6891b078f543438fe9434bd..9af29160faf2c4e10084c436cffe09e70f0dd960 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_sync_service.h
|
| +++ b/chrome/browser/supervised_user/supervised_user_sync_service.h
|
| @@ -107,20 +107,20 @@ class SupervisedUserSyncService : public KeyedService,
|
| void GetSupervisedUsersAsync(const SupervisedUsersCallback& callback);
|
|
|
| // KeyedService implementation:
|
| - virtual void Shutdown() OVERRIDE;
|
| + virtual void Shutdown() override;
|
|
|
| // SyncableService implementation:
|
| virtual 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;
|
| + scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
|
| + virtual void StopSyncing(syncer::ModelType type) override;
|
| virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
|
| - OVERRIDE;
|
| + override;
|
| virtual syncer::SyncError ProcessSyncChanges(
|
| const tracked_objects::Location& from_here,
|
| - const syncer::SyncChangeList& change_list) OVERRIDE;
|
| + const syncer::SyncChangeList& change_list) override;
|
|
|
| private:
|
| friend class SupervisedUserSyncServiceFactory;
|
|
|