diff options
author | mostynb <mostynb@opera.com> | 2014-10-03 17:40:32 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-04 00:40:55 +0000 |
commit | a15bee143f21dcc0fb91b8b7f81848a7e51a38bb (patch) | |
tree | 10b6e06058381b392a2e0147360afea9de38b36b /chrome/browser/extensions/api/audio | |
parent | e7c9f7781cbc6db099dacbefdc19ac2fd9bfc19a (diff) | |
download | chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.zip chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.tar.gz chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.tar.bz2 |
replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/
BUG=417463
Review URL: https://codereview.chromium.org/624153002
Cr-Commit-Position: refs/heads/master@{#298134}
Diffstat (limited to 'chrome/browser/extensions/api/audio')
4 files changed, 26 insertions, 26 deletions
diff --git a/chrome/browser/extensions/api/audio/audio_api.h b/chrome/browser/extensions/api/audio/audio_api.h index 8a33e85..6bad8f1 100644 --- a/chrome/browser/extensions/api/audio/audio_api.h +++ b/chrome/browser/extensions/api/audio/audio_api.h @@ -24,7 +24,7 @@ class AudioAPI : public BrowserContextKeyedAPI, public AudioService::Observer { static BrowserContextKeyedAPIFactory<AudioAPI>* GetFactoryInstance(); // AudioService::Observer implementation. - virtual void OnDeviceChanged() OVERRIDE; + virtual void OnDeviceChanged() override; private: friend class BrowserContextKeyedAPIFactory<AudioAPI>; @@ -45,7 +45,7 @@ class AudioGetInfoFunction : public ChromeAsyncExtensionFunction { protected: virtual ~AudioGetInfoFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnGetInfoCompleted(const OutputInfo& output_info, @@ -60,7 +60,7 @@ class AudioSetActiveDevicesFunction : public ChromeSyncExtensionFunction { protected: virtual ~AudioSetActiveDevicesFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class AudioSetPropertiesFunction : public ChromeSyncExtensionFunction { @@ -70,7 +70,7 @@ class AudioSetPropertiesFunction : public ChromeSyncExtensionFunction { protected: virtual ~AudioSetPropertiesFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; diff --git a/chrome/browser/extensions/api/audio/audio_service.cc b/chrome/browser/extensions/api/audio/audio_service.cc index e165de2..ebccc3f 100644 --- a/chrome/browser/extensions/api/audio/audio_service.cc +++ b/chrome/browser/extensions/api/audio/audio_service.cc @@ -12,16 +12,16 @@ class AudioServiceImpl : public AudioService { virtual ~AudioServiceImpl() {} // Called by listeners to this service to add/remove themselves as observers. - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; // Start to query audio device information. - virtual void StartGetInfo(const GetInfoCallback& callback) OVERRIDE; - virtual void SetActiveDevices(const DeviceIdList& device_list) OVERRIDE; + virtual void StartGetInfo(const GetInfoCallback& callback) override; + virtual void SetActiveDevices(const DeviceIdList& device_list) override; virtual bool SetDeviceProperties(const std::string& device_id, bool muted, int volume, - int gain) OVERRIDE; + int gain) override; }; void AudioServiceImpl::AddObserver(Observer* observer) { diff --git a/chrome/browser/extensions/api/audio/audio_service_chromeos.cc b/chrome/browser/extensions/api/audio/audio_service_chromeos.cc index a9c9ebd..bc20d21 100644 --- a/chrome/browser/extensions/api/audio/audio_service_chromeos.cc +++ b/chrome/browser/extensions/api/audio/audio_service_chromeos.cc @@ -25,26 +25,26 @@ class AudioServiceImpl : public AudioService, virtual ~AudioServiceImpl(); // Called by listeners to this service to add/remove themselves as observers. - virtual void AddObserver(AudioService::Observer* observer) OVERRIDE; - virtual void RemoveObserver(AudioService::Observer* observer) OVERRIDE; + virtual void AddObserver(AudioService::Observer* observer) override; + virtual void RemoveObserver(AudioService::Observer* observer) override; // Start to query audio device information. - virtual void StartGetInfo(const GetInfoCallback& callback) OVERRIDE; - virtual void SetActiveDevices(const DeviceIdList& device_list) OVERRIDE; + virtual void StartGetInfo(const GetInfoCallback& callback) override; + virtual void SetActiveDevices(const DeviceIdList& device_list) override; virtual bool SetDeviceProperties(const std::string& device_id, bool muted, int volume, - int gain) OVERRIDE; + int gain) override; protected: // chromeos::CrasAudioHandler::AudioObserver overrides. - virtual void OnOutputVolumeChanged() OVERRIDE; - virtual void OnInputGainChanged() OVERRIDE; - virtual void OnOutputMuteChanged() OVERRIDE; - virtual void OnInputMuteChanged() OVERRIDE; - virtual void OnAudioNodesChanged() OVERRIDE; - virtual void OnActiveOutputNodeChanged() OVERRIDE; - virtual void OnActiveInputNodeChanged() OVERRIDE; + virtual void OnOutputVolumeChanged() override; + virtual void OnInputGainChanged() override; + virtual void OnOutputMuteChanged() override; + virtual void OnInputMuteChanged() override; + virtual void OnAudioNodesChanged() override; + virtual void OnActiveOutputNodeChanged() override; + virtual void OnActiveInputNodeChanged() override; private: void NotifyDeviceChanged(); diff --git a/chrome/browser/extensions/api/audio/audio_service_linux.cc b/chrome/browser/extensions/api/audio/audio_service_linux.cc index a592264..625ecec 100644 --- a/chrome/browser/extensions/api/audio/audio_service_linux.cc +++ b/chrome/browser/extensions/api/audio/audio_service_linux.cc @@ -25,16 +25,16 @@ class AudioServiceImpl : public AudioService { private: // Called by listeners to this service to add/remove themselves as observers. - virtual void AddObserver(AudioService::Observer* observer) OVERRIDE; - virtual void RemoveObserver(AudioService::Observer* observer) OVERRIDE; + virtual void AddObserver(AudioService::Observer* observer) override; + virtual void RemoveObserver(AudioService::Observer* observer) override; // Start to query audio device information. - virtual void StartGetInfo(const GetInfoCallback& callback) OVERRIDE; - virtual void SetActiveDevices(const DeviceIdList& device_list) OVERRIDE; + virtual void StartGetInfo(const GetInfoCallback& callback) override; + virtual void SetActiveDevices(const DeviceIdList& device_list) override; virtual bool SetDeviceProperties(const std::string& device_id, bool muted, int volume, - int gain) OVERRIDE; + int gain) override; // List of observers. ObserverList<AudioService::Observer> observer_list_; |