| Index: ash/system/win/audio/tray_audio_delegate_win.h
|
| diff --git a/ash/system/chromeos/audio/tray_audio_delegate_chromeos.h b/ash/system/win/audio/tray_audio_delegate_win.h
|
| similarity index 65%
|
| copy from ash/system/chromeos/audio/tray_audio_delegate_chromeos.h
|
| copy to ash/system/win/audio/tray_audio_delegate_win.h
|
| index 58e714d97a15c4df338d5f232a075c1733bd16c6..4014f95ff9f7b5eb5ed1608f64bbe933e5698222 100644
|
| --- a/ash/system/chromeos/audio/tray_audio_delegate_chromeos.h
|
| +++ b/ash/system/win/audio/tray_audio_delegate_win.h
|
| @@ -2,19 +2,23 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_SYSTEM_AUDIO_TRAY_AUDIO_DELEGATE_CHROMEOS_H_
|
| -#define ASH_SYSTEM_AUDIO_TRAY_AUDIO_DELEGATE_CHROMEOS_H_
|
| +#ifndef ASH_SYSTEM_WIN_AUDIO_TRAY_AUDIO_DELEGATE_WIN_H_
|
| +#define ASH_SYSTEM_WIN_AUDIO_TRAY_AUDIO_DELEGATE_WIN_H_
|
| +
|
| +#include <audioclient.h>
|
| +#include <mmdeviceapi.h>
|
|
|
| #include "ash/ash_export.h"
|
| #include "ash/system/audio/tray_audio_delegate.h"
|
| #include "base/compiler_specific.h"
|
| +#include "base/win/scoped_comptr.h"
|
|
|
| namespace ash {
|
| namespace system {
|
|
|
| -class ASH_EXPORT TrayAudioDelegateChromeOs : public TrayAudioDelegate {
|
| +class ASH_EXPORT TrayAudioDelegateWin : public TrayAudioDelegate {
|
| public:
|
| - virtual ~TrayAudioDelegateChromeOs() {}
|
| + virtual ~TrayAudioDelegateWin() {}
|
|
|
| // Overridden from TrayAudioDelegate.
|
| virtual void AdjustOutputVolumeToAudibleLevel() OVERRIDE;
|
| @@ -25,9 +29,12 @@ class ASH_EXPORT TrayAudioDelegateChromeOs : public TrayAudioDelegate {
|
| virtual bool IsOutputAudioMuted() OVERRIDE;
|
| virtual void SetOutputAudioIsMuted(bool is_muted) OVERRIDE;
|
| virtual void SetOutputVolumeLevel(int level) OVERRIDE;
|
| +
|
| + private:
|
| + base::win::ScopedComPtr<ISimpleAudioVolume> CreateDefaultVolumeControl();
|
| };
|
|
|
| } // namespace system
|
| } // namespace ash
|
|
|
| -#endif // ASH_SYSTEM_AUDIO_TRAY_AUDIO_DELEGATE_CHROMEOS_H_
|
| +#endif // ASH_SYSTEM_WIN_AUDIO_TRAY_AUDIO_DELEGATE_WIN_H_
|
|
|