Index: content/browser/renderer_host/media/video_capture_host.cc |
diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc |
index 4bf69f1442d8ce254e1a577913de938b25409f50..1391e1ac59e1ae418802637c08e1c54e8cf0d2df 100644 |
--- a/content/browser/renderer_host/media/video_capture_host.cc |
+++ b/content/browser/renderer_host/media/video_capture_host.cc |
@@ -11,6 +11,7 @@ |
#include "content/browser/renderer_host/media/media_stream_manager.h" |
#include "content/browser/renderer_host/media/video_capture_manager.h" |
#include "content/common/media/video_capture_messages.h" |
+#include "content/public/common/media_stream_request.h" |
using content::BrowserMainLoop; |
using content::BrowserMessageFilter; |
@@ -279,5 +280,9 @@ void VideoCaptureHost::DeleteVideoCaptureControllerOnIOThread( |
media_stream::VideoCaptureManager* VideoCaptureHost::GetVideoCaptureManager() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
- return BrowserMainLoop::GetMediaStreamManager()->video_capture_manager(); |
+ // TODO(miu): Confirm use of VideoCaptureHostMsg_* only applies to the |
+ // physical video capture devices, and does not have anything to do with |
+ // MediaStreamHostMsg_*. |
wjia(left Chromium)
2012/09/07 14:11:36
VideoCaptureHost should also take care of MEDIA_VI
miu
2012/09/07 23:14:28
This functionality isn't needed yet, since we only
|
+ return BrowserMainLoop::GetMediaStreamManager()->GetVideoCaptureManager( |
+ content::MEDIA_VIDEO_DEVICE_CAPTURE); |
} |