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

Side by Side Diff: ash/system/win/audio/tray_audio_delegate_win.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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 unified diff | Download patch
« no previous file with comments | « ash/system/web_notification/web_notification_tray_unittest.cc ('k') | ash/test/ash_test_base.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SYSTEM_WIN_AUDIO_TRAY_AUDIO_DELEGATE_WIN_H_ 5 #ifndef ASH_SYSTEM_WIN_AUDIO_TRAY_AUDIO_DELEGATE_WIN_H_
6 #define ASH_SYSTEM_WIN_AUDIO_TRAY_AUDIO_DELEGATE_WIN_H_ 6 #define ASH_SYSTEM_WIN_AUDIO_TRAY_AUDIO_DELEGATE_WIN_H_
7 7
8 #include <audioclient.h> 8 #include <audioclient.h>
9 #include <mmdeviceapi.h> 9 #include <mmdeviceapi.h>
10 10
11 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
12 #include "ash/system/audio/tray_audio_delegate.h" 12 #include "ash/system/audio/tray_audio_delegate.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/win/scoped_comptr.h" 14 #include "base/win/scoped_comptr.h"
15 15
16 namespace ash { 16 namespace ash {
17 namespace system { 17 namespace system {
18 18
19 class ASH_EXPORT TrayAudioDelegateWin : public TrayAudioDelegate { 19 class ASH_EXPORT TrayAudioDelegateWin : public TrayAudioDelegate {
20 public: 20 public:
21 virtual ~TrayAudioDelegateWin() {} 21 virtual ~TrayAudioDelegateWin() {}
22 22
23 // Overridden from TrayAudioDelegate. 23 // Overridden from TrayAudioDelegate.
24 virtual void AdjustOutputVolumeToAudibleLevel() OVERRIDE; 24 virtual void AdjustOutputVolumeToAudibleLevel() override;
25 virtual int GetOutputDefaultVolumeMuteLevel() OVERRIDE; 25 virtual int GetOutputDefaultVolumeMuteLevel() override;
26 virtual int GetOutputVolumeLevel() OVERRIDE; 26 virtual int GetOutputVolumeLevel() override;
27 virtual int GetActiveOutputDeviceIconId() OVERRIDE; 27 virtual int GetActiveOutputDeviceIconId() override;
28 virtual bool HasAlternativeSources() OVERRIDE; 28 virtual bool HasAlternativeSources() override;
29 virtual bool IsOutputAudioMuted() OVERRIDE; 29 virtual bool IsOutputAudioMuted() override;
30 virtual void SetOutputAudioIsMuted(bool is_muted) OVERRIDE; 30 virtual void SetOutputAudioIsMuted(bool is_muted) override;
31 virtual void SetOutputVolumeLevel(int level) OVERRIDE; 31 virtual void SetOutputVolumeLevel(int level) override;
32 virtual void SetInternalSpeakerChannelMode(AudioChannelMode mode) OVERRIDE; 32 virtual void SetInternalSpeakerChannelMode(AudioChannelMode mode) override;
33 33
34 private: 34 private:
35 base::win::ScopedComPtr<ISimpleAudioVolume> CreateDefaultVolumeControl(); 35 base::win::ScopedComPtr<ISimpleAudioVolume> CreateDefaultVolumeControl();
36 }; 36 };
37 37
38 } // namespace system 38 } // namespace system
39 } // namespace ash 39 } // namespace ash
40 40
41 #endif // ASH_SYSTEM_WIN_AUDIO_TRAY_AUDIO_DELEGATE_WIN_H_ 41 #endif // ASH_SYSTEM_WIN_AUDIO_TRAY_AUDIO_DELEGATE_WIN_H_
OLDNEW
« no previous file with comments | « ash/system/web_notification/web_notification_tray_unittest.cc ('k') | ash/test/ash_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698