media/video/capture/win/video_capture_device_win.cc - Issue 292663010: Merge 271560 "Add a ChromeOS implementation of VideoCaptureDevic..."

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: media/video/capture/win/video_capture_device_win.cc

Issue 292663010: Merge 271560 "Add a ChromeOS implementation of VideoCaptureDevic..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1985/src/

Patch Set: Created 6 years, 7 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: media/video/capture/win/video_capture_device_win.cc

===================================================================

--- media/video/capture/win/video_capture_device_win.cc (revision 271940)

+++ media/video/capture/win/video_capture_device_win.cc (working copy)

@@ -245,7 +245,9 @@

}

// static

-VideoCaptureDevice* VideoCaptureDevice::Create(const Name& device_name) {

+VideoCaptureDevice* VideoCaptureDevice::Create(

+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,

+ const Name& device_name) {

VideoCaptureDevice* ret = NULL;

if (device_name.capture_api_type() == Name::MEDIA_FOUNDATION) {

DCHECK(VideoCaptureDeviceMFWin::PlatformSupported());

« no previous file with comments | « media/video/capture/video_capture_device_unittest.cc ('k') | no next file » | no next file with comments »