content/browser/renderer_host/media/web_contents_video_capture_device.h - 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.h

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/video_capture_manager_unittest.cc ('k') | content/browser/renderer_host/media/web_contents_video_capture_device.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.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 94ac0680f6fbea91b88d7657a26bfff097baf86c..0dfe1d6e2f03efe12e8be8cc4484f97ba4dffed0 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

@@ -27,7 +27,7 @@ class RenderWidgetHost;

// underlying render view to be swapped out (e.g., due to navigation or

// crashes/reloads), without any interruption in capturing.

class CONTENT_EXPORT WebContentsVideoCaptureDevice

- : public media::VideoCaptureDevice {

+ : public media::VideoCaptureDevice1 {

public:

// Construct from a |device_id| string of the form:

// "virtual-media-stream://render_process_id:render_view_id", where

@@ -37,7 +37,7 @@ class CONTENT_EXPORT WebContentsVideoCaptureDevice

// WebContentsVideoCaptureDevice is itself deleted.

// TODO(miu): Passing a destroy callback suggests needing to revisit the

// design philosophy of an asynchronous DeAllocate(). http://crbug.com/158641

- static media::VideoCaptureDevice* Create(const std::string& device_id);

+ static media::VideoCaptureDevice1* Create(const std::string& device_id);

virtual ~WebContentsVideoCaptureDevice();