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

« chrome/browser/media/media_stream_devices_controller.h ('K') | « content/browser/renderer_host/media/audio_input_renderer_host.cc ('k') | content/browser/renderer_host/media/media_stream_device_settings_unittest.cc » ('j') | content/browser/renderer_host/media/media_stream_dispatcher_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 054a07a25d45f87c9049d2b44f22a7d87510814a..53f9875aaace3c67ef537845b968c165cb7c69d4 100644

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

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

@@ -134,10 +134,10 @@ void DoDeviceRequest(const MediaStreamDeviceSettingsRequest& request,

bool IsRequestReadyForView(

media_stream::MediaStreamDeviceSettingsRequest* request) {

- if ((request->options.audio && request->devices_full.count(

- content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE) == 0) ||

- (request->options.video && request->devices_full.count(

- content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE) == 0)) {

+ if ((content::IsAudioMediaType(request->options.audio_type) &&

+ request->devices_full.count(request->options.audio_type) == 0) ||

+ (content::IsVideoMediaType(request->options.video_type) &&

+ request->devices_full.count(request->options.video_type) == 0)) {

return false;

}