Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Unified Diff: extensions/shell/browser/shell_audio_controller_chromeos.h

Issue 622343002: replace OVERRIDE and FINAL with override and final in extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/shell/browser/shell_audio_controller_chromeos.h
diff --git a/extensions/shell/browser/shell_audio_controller_chromeos.h b/extensions/shell/browser/shell_audio_controller_chromeos.h
index ea7d446bdc822810e8443e3e416ae1eb87512895..7ab2e3386c7989b825dff00fd83e4f96e9426dae 100644
--- a/extensions/shell/browser/shell_audio_controller_chromeos.h
+++ b/extensions/shell/browser/shell_audio_controller_chromeos.h
@@ -25,20 +25,20 @@ class ShellAudioController : public chromeos::CrasAudioHandler::AudioObserver {
// chromeos::AudioDevicesPrefHandler implementation:
virtual double GetOutputVolumeValue(
- const chromeos::AudioDevice* device) OVERRIDE;
+ const chromeos::AudioDevice* device) override;
virtual double GetInputGainValue(
- const chromeos::AudioDevice* device) OVERRIDE;
+ const chromeos::AudioDevice* device) override;
virtual void SetVolumeGainValue(const chromeos::AudioDevice& device,
- double value) OVERRIDE;
- virtual bool GetMuteValue(const chromeos::AudioDevice& device) OVERRIDE;
+ double value) override;
+ virtual bool GetMuteValue(const chromeos::AudioDevice& device) override;
virtual void SetMuteValue(const chromeos::AudioDevice& device,
- bool mute_on) OVERRIDE;
- virtual bool GetAudioCaptureAllowedValue() OVERRIDE;
- virtual bool GetAudioOutputAllowedValue() OVERRIDE;
+ bool mute_on) override;
+ virtual bool GetAudioCaptureAllowedValue() override;
+ virtual bool GetAudioOutputAllowedValue() override;
virtual void AddAudioPrefObserver(
- chromeos::AudioPrefObserver* observer) OVERRIDE;
+ chromeos::AudioPrefObserver* observer) override;
virtual void RemoveAudioPrefObserver(
- chromeos::AudioPrefObserver* observer) OVERRIDE;
+ chromeos::AudioPrefObserver* observer) override;
protected:
virtual ~PrefHandler();
@@ -51,13 +51,13 @@ class ShellAudioController : public chromeos::CrasAudioHandler::AudioObserver {
virtual ~ShellAudioController();
// chromeos::CrasAudioHandler::Observer implementation:
- virtual void OnOutputVolumeChanged() OVERRIDE;
- virtual void OnOutputMuteChanged() OVERRIDE;
- virtual void OnInputGainChanged() OVERRIDE;
- virtual void OnInputMuteChanged() OVERRIDE;
- virtual void OnAudioNodesChanged() OVERRIDE;
- virtual void OnActiveOutputNodeChanged() OVERRIDE;
- virtual void OnActiveInputNodeChanged() OVERRIDE;
+ virtual void OnOutputVolumeChanged() override;
+ virtual void OnOutputMuteChanged() override;
+ virtual void OnInputGainChanged() override;
+ virtual void OnInputMuteChanged() override;
+ virtual void OnAudioNodesChanged() override;
+ virtual void OnActiveOutputNodeChanged() override;
+ virtual void OnActiveInputNodeChanged() override;
private:
// Gets the current device list from CRAS, chooses the best input and output
« no previous file with comments | « extensions/shell/browser/shell_app_window_client.h ('k') | extensions/shell/browser/shell_browser_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698