content/browser/renderer_host/media/web_contents_video_capture_device.cc - Issue 24133002: Make VideoCaptureController single-threaded and not ref counted.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 24133002: Make VideoCaptureController single-threaded and not ref counted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: git pull Created 7 years, 3 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

« content/browser/renderer_host/media/video_capture_controller.cc ('K') | « content/browser/renderer_host/media/web_contents_video_capture_device.h ('k') | content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc » ('j') | media/video/capture/video_capture_device.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/web_contents_video_capture_device.cc

diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.cc b/content/browser/renderer_host/media/web_contents_video_capture_device.cc

index b807d83c54df6c15bb00a032d3591b2eee6363f3..91feb4d48733c030c93b3b50717408d65ac89daa 100644

--- a/content/browser/renderer_host/media/web_contents_video_capture_device.cc

+++ b/content/browser/renderer_host/media/web_contents_video_capture_device.cc

@@ -1228,7 +1228,7 @@ WebContentsVideoCaptureDevice::~WebContentsVideoCaptureDevice() {

}

// static

-media::VideoCaptureDevice* WebContentsVideoCaptureDevice::Create(

+media::VideoCaptureDevice1* WebContentsVideoCaptureDevice::Create(

const std::string& device_id) {

// Parse device_id into render_process_id and render_view_id.

int render_process_id = -1;