Index: content/browser/media_devices_monitor.cc |
=================================================================== |
--- content/browser/media_devices_monitor.cc (revision 207505) |
+++ content/browser/media_devices_monitor.cc (working copy) |
@@ -9,12 +9,22 @@ |
#include "content/public/browser/browser_thread.h" |
namespace content { |
- |
-void EnsureMonitorCaptureDevices() { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
+namespace { |
+void EnsureMonitorCaptureDevicesInternal( |
+ MediaStreamManager* media_stream_manager) { |
// Post a EnumerateDevices() API to MSM to start the monitoring. |
scherkus (not reviewing)
2013/06/21 00:42:43
comment is incorrect
jam
2013/06/21 15:38:58
that's what it was before?
scherkus (not reviewing)
2013/06/21 16:18:42
oh I was referring to the "post to start" -- that
jam
2013/06/21 16:49:19
what I meant was that that comment was there befor
|
- BrowserMainLoop::GetMediaStreamManager()->EnumerateDevices( |
+ media_stream_manager->EnumerateDevices( |
NULL, -1, -1, MEDIA_DEVICE_AUDIO_CAPTURE, GURL()); |
} |
+} |
+void EnsureMonitorCaptureDevices() { |
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ |
+ BrowserThread::PostTask( |
+ BrowserThread::IO, FROM_HERE, |
+ base::Bind(&EnsureMonitorCaptureDevicesInternal, |
scherkus (not reviewing)
2013/06/21 00:42:43
I guess we could replace EnsureMonitorCaptureDevic
jam
2013/06/21 15:38:58
Done. it ended up looking not so pretty though bec
|
+ BrowserMainLoop::GetInstance()->media_stream_manager())); |
+} |
+ |
} // namespace content |