| 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 9af29160faf2c4e10084c436cffe09e70f0dd960..c5eb8dfb9edb5330437e57bf6cc8ba88b40778e8 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_sync_service.h
|
| +++ b/chrome/browser/supervised_user/supervised_user_sync_service.h
|
| @@ -46,7 +46,7 @@ class SupervisedUserSyncService : public KeyedService,
|
| // Represents a non-existing avatar on Chrome and Chrome OS.
|
| static const int kNoAvatar;
|
|
|
| - virtual ~SupervisedUserSyncService();
|
| + ~SupervisedUserSyncService() override;
|
|
|
| static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
|
|
|
| @@ -107,18 +107,17 @@ class SupervisedUserSyncService : public KeyedService,
|
| void GetSupervisedUsersAsync(const SupervisedUsersCallback& callback);
|
|
|
| // KeyedService implementation:
|
| - virtual void Shutdown() override;
|
| + void Shutdown() override;
|
|
|
| // 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;
|
|
|
|
|