content/browser/renderer_host/media/video_capture_host.cc - Issue 10912004: Begin adding support for tab mirroring via the MediaStream audio/video capturing

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/video_capture_host.cc

Issue 10912004: Begin adding support for tab mirroring via the MediaStream audio/video capturing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: AudioManager injection into MediaStreamManager, consistent enum naming; per wjia@ comments. Also, … Created 8 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/media_stream_manager.h ('K') | « content/browser/renderer_host/media/video_capture_host.h ('k') | content/browser/renderer_host/media/video_capture_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4bf69f1442d8ce254e1a577913de938b25409f50..f427078d4b1668f158de2a29abc810bd49d0a087 100644

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

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

@@ -11,6 +11,7 @@

#include "content/browser/renderer_host/media/media_stream_manager.h"

#include "content/browser/renderer_host/media/video_capture_manager.h"

#include "content/common/media/video_capture_messages.h"

+#include "content/public/common/media_stream_request.h"

using content::BrowserMainLoop;

using content::BrowserMessageFilter;

@@ -279,5 +280,10 @@ void VideoCaptureHost::DeleteVideoCaptureControllerOnIOThread(

media_stream::VideoCaptureManager* VideoCaptureHost::GetVideoCaptureManager() {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));

- return BrowserMainLoop::GetMediaStreamManager()->video_capture_manager();

+ // NOTE: Currently, use of VideoCaptureHostMsg_* only applies to the

+ // MEDIA_DEVICE_VIDEO_CAPTURE. The IPC interface could theoretically be

+ // extended to allow operation with the other video capture types (e.g., tab

+ // mirroring).

+ return BrowserMainLoop::GetMediaStreamManager()->GetVideoCaptureManager(

+ content::MEDIA_DEVICE_VIDEO_CAPTURE);

}