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

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

Issue 178883004: Enable the volume slider in Ash for windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix COM initialization errors (the right way). Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/win/OWNERS ('k') | ash/system/win/audio/tray_audio_delegate_win.cc » ('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_AUDIO_TRAY_AUDIO_DELEGATE_CHROMEOS_H_ 5 #ifndef ASH_SYSTEM_WIN_AUDIO_TRAY_AUDIO_DELEGATE_WIN_H_
6 #define ASH_SYSTEM_AUDIO_TRAY_AUDIO_DELEGATE_CHROMEOS_H_ 6 #define ASH_SYSTEM_WIN_AUDIO_TRAY_AUDIO_DELEGATE_WIN_H_
7
8 #include <audioclient.h>
9 #include <mmdeviceapi.h>
7 10
8 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
9 #include "ash/system/audio/tray_audio_delegate.h" 12 #include "ash/system/audio/tray_audio_delegate.h"
10 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/win/scoped_comptr.h"
11 15
12 namespace ash { 16 namespace ash {
13 namespace system { 17 namespace system {
14 18
15 class ASH_EXPORT TrayAudioDelegateChromeOs : public TrayAudioDelegate { 19 class ASH_EXPORT TrayAudioDelegateWin : public TrayAudioDelegate {
16 public: 20 public:
17 virtual ~TrayAudioDelegateChromeOs() {} 21 virtual ~TrayAudioDelegateWin() {}
18 22
19 // Overridden from TrayAudioDelegate. 23 // Overridden from TrayAudioDelegate.
20 virtual void AdjustOutputVolumeToAudibleLevel() OVERRIDE; 24 virtual void AdjustOutputVolumeToAudibleLevel() OVERRIDE;
21 virtual int GetOutputDefaultVolumeMuteLevel() OVERRIDE; 25 virtual int GetOutputDefaultVolumeMuteLevel() OVERRIDE;
22 virtual int GetOutputVolumeLevel() OVERRIDE; 26 virtual int GetOutputVolumeLevel() OVERRIDE;
23 virtual int GetActiveOutputDeviceIconId() OVERRIDE; 27 virtual int GetActiveOutputDeviceIconId() OVERRIDE;
24 virtual bool HasAlternativeSources() OVERRIDE; 28 virtual bool HasAlternativeSources() OVERRIDE;
25 virtual bool IsOutputAudioMuted() OVERRIDE; 29 virtual bool IsOutputAudioMuted() OVERRIDE;
26 virtual void SetOutputAudioIsMuted(bool is_muted) OVERRIDE; 30 virtual void SetOutputAudioIsMuted(bool is_muted) OVERRIDE;
27 virtual void SetOutputVolumeLevel(int level) OVERRIDE; 31 virtual void SetOutputVolumeLevel(int level) OVERRIDE;
32
33 private:
34 base::win::ScopedComPtr<ISimpleAudioVolume> CreateDefaultVolumeControl();
28 }; 35 };
29 36
30 } // namespace system 37 } // namespace system
31 } // namespace ash 38 } // namespace ash
32 39
33 #endif // ASH_SYSTEM_AUDIO_TRAY_AUDIO_DELEGATE_CHROMEOS_H_ 40 #endif // ASH_SYSTEM_WIN_AUDIO_TRAY_AUDIO_DELEGATE_WIN_H_
OLDNEW
« no previous file with comments | « ash/system/win/OWNERS ('k') | ash/system/win/audio/tray_audio_delegate_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698