| Index: chrome/browser/supervised_user/supervised_user_settings_service.h
|
| diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.h b/chrome/browser/supervised_user/supervised_user_settings_service.h
|
| index e600c794727574ee5eb5992d8da9e7a643ea7baa..31be839993de1d6ca4170fb068e68ec9add2ce7a 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_settings_service.h
|
| +++ b/chrome/browser/supervised_user/supervised_user_settings_service.h
|
| @@ -59,7 +59,7 @@ class SupervisedUserSettingsService : public KeyedService,
|
| typedef base::Callback<void(const base::DictionaryValue*)> SettingsCallback;
|
|
|
| SupervisedUserSettingsService();
|
| - virtual ~SupervisedUserSettingsService();
|
| + ~SupervisedUserSettingsService() override;
|
|
|
| // Initializes the service by loading its settings from a file underneath the
|
| // |profile_path|. File I/O will be serialized via the
|
| @@ -109,24 +109,23 @@ class SupervisedUserSettingsService : public KeyedService,
|
| const base::Value& value);
|
|
|
| // 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;
|
|
|
| // PrefStore::Observer implementation:
|
| - virtual void OnPrefValueChanged(const std::string& key) override;
|
| - virtual void OnInitializationCompleted(bool success) override;
|
| + void OnPrefValueChanged(const std::string& key) override;
|
| + void OnInitializationCompleted(bool success) override;
|
|
|
| private:
|
| base::DictionaryValue* GetOrCreateDictionary(const std::string& key) const;
|
|
|