| Index: content/browser/renderer_host/media/audio_input_device_manager.h
|
| diff --git a/content/browser/renderer_host/media/audio_input_device_manager.h b/content/browser/renderer_host/media/audio_input_device_manager.h
|
| index 3f0b34c451f46cd043ab744b1d78ab7d60d7ca0c..1168dbced6920f0e56d3844fe045916ab1786bf9 100644
|
| --- a/content/browser/renderer_host/media/audio_input_device_manager.h
|
| +++ b/content/browser/renderer_host/media/audio_input_device_manager.h
|
| @@ -29,16 +29,15 @@ namespace media_stream {
|
|
|
| class AudioInputDeviceManagerEventHandler;
|
|
|
| -class CONTENT_EXPORT AudioInputDeviceManager
|
| - : public base::RefCountedThreadSafe<AudioInputDeviceManager>,
|
| - public MediaStreamProvider {
|
| +class CONTENT_EXPORT AudioInputDeviceManager : public MediaStreamProvider {
|
| public:
|
| // Calling Start() with this kFakeOpenSessionId will open the default device,
|
| // even though Open() has not been called. This is used to be able to use the
|
| // AudioInputDeviceManager before MediaStream is implemented.
|
| static const int kFakeOpenSessionId;
|
|
|
| - explicit AudioInputDeviceManager(media::AudioManager* audio_manager);
|
| + AudioInputDeviceManager(media::AudioManager* audio_manager,
|
| + media_stream::MediaStreamType device_type);
|
|
|
| // MediaStreamProvider implementation, called on IO thread.
|
| virtual void Register(MediaStreamProviderListener* listener,
|
| @@ -56,7 +55,6 @@ class CONTENT_EXPORT AudioInputDeviceManager
|
| void Stop(int session_id);
|
|
|
| private:
|
| - friend class base::RefCountedThreadSafe<AudioInputDeviceManager>;
|
| virtual ~AudioInputDeviceManager();
|
|
|
| // Executed on media stream device thread.
|
| @@ -80,7 +78,11 @@ class CONTENT_EXPORT AudioInputDeviceManager
|
| // Only accessed from media stream device thread.
|
| typedef std::map<int, media::AudioDeviceName> AudioInputDeviceMap;
|
| AudioInputDeviceMap devices_;
|
| - media::AudioManager* audio_manager_;
|
| + media::AudioManager* const audio_manager_;
|
| +
|
| + // The type of audio input devices managed by this instance (e.g., physical
|
| + // audio device capture, tab audio output).
|
| + const media_stream::MediaStreamType device_type_;
|
|
|
| // The message loop of media stream device thread that this object runs on.
|
| scoped_refptr<base::MessageLoopProxy> device_loop_;
|
|
|