content/browser/renderer_host/media/web_contents_video_capture_device.h - Issue 83633008: Reland: Reorganize media::VideoCapture* types

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.h

Issue 83633008: Reland: Reorganize media::VideoCapture* types (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 1 month 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

« no previous file with comments | « content/browser/renderer_host/media/video_capture_manager_unittest.cc ('k') | content/browser/renderer_host/media/web_contents_video_capture_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 35d42d5d1d0fca3bd592690d1d89d1fc53d62b7b..cd99a225a57b32ca70deb2519c627cc5b3c9af4d 100644

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

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

@@ -42,9 +42,8 @@ class CONTENT_EXPORT WebContentsVideoCaptureDevice

virtual ~WebContentsVideoCaptureDevice();

// VideoCaptureDevice implementation.

- virtual void AllocateAndStart(

- const media::VideoCaptureCapability& capture_format,

- scoped_ptr<Client> client) OVERRIDE;

+ virtual void AllocateAndStart(const media::VideoCaptureParams& params,

+ scoped_ptr<Client> client) OVERRIDE;

virtual void StopAndDeAllocate() OVERRIDE;

private: