| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "content/public/browser/media_devices_monitor.h" | 5 #include "content/public/browser/media_devices_monitor.h" |
| 6 | 6 |
| 7 #include "content/browser/browser_main_loop.h" | 7 #include "content/browser/browser_main_loop.h" |
| 8 #include "content/browser/renderer_host/media/media_stream_manager.h" | 8 #include "content/browser/renderer_host/media/media_stream_manager.h" |
| 9 #include "content/public/browser/browser_thread.h" | 9 #include "content/public/browser/browser_thread.h" |
| 10 | 10 |
| 11 namespace content { | 11 namespace content { |
| 12 namespace { | 12 namespace { |
| 13 void EnsureMonitorCaptureDevicesInternal( | 13 void EnsureMonitorCaptureDevicesInternal( |
| 14 MediaStreamManager* media_stream_manager) { | 14 MediaStreamManager* media_stream_manager) { |
| 15 media_stream_manager->EnumerateDevices( | 15 media_stream_manager->EnumerateDevices( |
| 16 NULL, -1, -1, -1, MEDIA_DEVICE_AUDIO_CAPTURE, GURL()); | 16 NULL, -1, -1, NULL, -1, MEDIA_DEVICE_AUDIO_CAPTURE, GURL()); |
| 17 } | 17 } |
| 18 } | 18 } |
| 19 | 19 |
| 20 void EnsureMonitorCaptureDevices() { | 20 void EnsureMonitorCaptureDevices() { |
| 21 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 21 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 22 | 22 |
| 23 BrowserThread::PostTask( | 23 BrowserThread::PostTask( |
| 24 BrowserThread::IO, FROM_HERE, | 24 BrowserThread::IO, FROM_HERE, |
| 25 base::Bind(&EnsureMonitorCaptureDevicesInternal, | 25 base::Bind(&EnsureMonitorCaptureDevicesInternal, |
| 26 BrowserMainLoop::GetInstance()->media_stream_manager())); | 26 BrowserMainLoop::GetInstance()->media_stream_manager())); |
| 27 } | 27 } |
| 28 | 28 |
| 29 } // namespace content | 29 } // namespace content |
| OLD | NEW |