content/renderer/media/media_stream_impl.cc - Issue 323313003: Add flag in device enumeration request to control label clearing and don't clear for pepper.

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/renderer/media/media_stream_impl.cc

Issue 323313003: Add flag in device enumeration request to control label clearing and don't clear for pepper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 6 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 | « content/renderer/media/media_stream_dispatcher_unittest.cc ('k') | content/renderer/media/mock_media_stream_dispatcher.h » ('j') | content/renderer/pepper/pepper_media_device_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_impl.cc

diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc

index 8bb9fd540ba4fc45dd189fa617717c0961c62cfc..79f86a8321715e245ee946c6755176717983ea24 100644

--- a/content/renderer/media/media_stream_impl.cc

+++ b/content/renderer/media/media_stream_impl.cc

@@ -228,19 +228,22 @@ void MediaStreamImpl::requestMediaDevices(

audio_input_request_id,

AsWeakPtr(),

MEDIA_DEVICE_AUDIO_CAPTURE,

- security_origin);

+ security_origin,

+ true);

media_stream_dispatcher_->EnumerateDevices(

video_input_request_id,

AsWeakPtr(),

MEDIA_DEVICE_VIDEO_CAPTURE,

- security_origin);

+ security_origin,

+ true);

media_stream_dispatcher_->EnumerateDevices(

audio_output_request_id,

AsWeakPtr(),

MEDIA_DEVICE_AUDIO_OUTPUT,

- security_origin);

+ security_origin,

+ true);

}

void MediaStreamImpl::cancelMediaDevicesRequest(