Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Unified Diff: content/browser/renderer_host/media/video_capture_manager.cc

Issue 10928043: Media Related changes for TabCapture API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fixes Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/video_capture_manager.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc
index 8ed7a81e70164059bc3580c1a44605deb25b0800..261ef8e19a9068c81621ffafb735371969eef210 100644
--- a/content/browser/renderer_host/media/video_capture_manager.cc
+++ b/content/browser/renderer_host/media/video_capture_manager.cc
@@ -173,6 +173,8 @@ void VideoCaptureManager::OnOpen(int capture_session_id,
case content::MEDIA_TAB_VIDEO_CAPTURE:
// TODO(miu): Replace this stub with the actual implementation in a
// later change.
+ // TODO(justinlin): This is so we don't get a null device. Remove later.
+ vc_device_name.unique_id = "/dev/video1";
video_capture_device =
media::FakeVideoCaptureDevice::Create(vc_device_name);
break;
@@ -189,6 +191,7 @@ void VideoCaptureManager::OnOpen(int capture_session_id,
DeviceEntry& new_entry = devices_[capture_session_id];
new_entry.stream_type = device.stream_type;
new_entry.capture_device = video_capture_device;
+
PostOnOpened(device.stream_type, capture_session_id);
}

Powered by Google App Engine
This is Rietveld 408576698