content/browser/renderer_host/media/media_stream_dispatcher_host.cc - Issue 312773002: Support for audio output devices for getMediaDevices.

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_dispatcher_host.cc

Issue 312773002: Support for audio output devices for getMediaDevices. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Added test case for group ID in unit test. 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

« no previous file with comments | « chrome/browser/media/media_stream_capture_indicator.cc ('k') | content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc » ('j') | content/renderer/media/mock_media_stream_dispatcher.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 78372bb57b898774451f06f8c8c5c480feea543e..36f6794ccead4771c475e406c7a645b8c194389d 100644

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

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

@@ -181,10 +181,12 @@ void MediaStreamDispatcherHost::OnEnumerateDevices(

return;

DCHECK(type == MEDIA_DEVICE_AUDIO_CAPTURE ||

- type == MEDIA_DEVICE_VIDEO_CAPTURE);

- bool have_permission = type == MEDIA_DEVICE_AUDIO_CAPTURE ?

- resource_context_->AllowMicAccess(security_origin) :

- resource_context_->AllowCameraAccess(security_origin);

+ type == MEDIA_DEVICE_VIDEO_CAPTURE ||

+ type == MEDIA_DEVICE_AUDIO_OUTPUT);

+ bool have_permission =

+ type == MEDIA_DEVICE_AUDIO_CAPTURE || type == MEDIA_DEVICE_AUDIO_OUTPUT ?

+ resource_context_->AllowMicAccess(security_origin) :

+ resource_context_->AllowCameraAccess(security_origin);

media_stream_manager_->EnumerateDevices(

this, render_process_id_, render_view_id, salt_callback_,