| Index: content/browser/renderer_host/media/media_stream_manager.h
|
| diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
|
| index e437a8286670c5867862bd6b614623de51a2097a..2d2ec87f2eb406a0cdb51b8e351bf7949be49ecd 100644
|
| --- a/content/browser/renderer_host/media/media_stream_manager.h
|
| +++ b/content/browser/renderer_host/media/media_stream_manager.h
|
| @@ -246,6 +246,11 @@ class CONTENT_EXPORT MediaStreamManager
|
|
|
| void DoEnumerateDevices(const std::string& label);
|
|
|
| + // Enumerates audio output devices. No caching.
|
| + void EnumerateAudioOutputDevices(const std::string& label);
|
| +
|
| + void AudioOutputDevicesEnumerated(const StreamDeviceInfoArray& devices);
|
| +
|
| // Helpers.
|
| // Checks if all devices that was requested in the request identififed by
|
| // |label| has been opened and set the request state accordingly.
|
| @@ -353,7 +358,8 @@ class CONTENT_EXPORT MediaStreamManager
|
| StreamDeviceInfoArray devices,
|
| gfx::NativeViewId window_id);
|
|
|
| - // Task runner shared by VideoCaptureManager and AudioInputDeviceManager.
|
| + // Task runner shared by VideoCaptureManager and AudioInputDeviceManager and
|
| + // used for enumerating audio output devices.
|
| // Note: Enumeration tasks may take seconds to complete so must never be run
|
| // on any of the BrowserThreads (UI, IO, etc). See http://crbug.com/256945.
|
| scoped_refptr<base::SingleThreadTaskRunner> device_task_runner_;
|
|
|