content/renderer/media/mock_media_stream_dispatcher.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/mock_media_stream_dispatcher.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: Rebase 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/mock_media_stream_dispatcher.h ('k') | content/renderer/pepper/pepper_media_device_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/mock_media_stream_dispatcher.cc

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

index 7854a8d6574bbd60bfe53e5d92357ba4945e297d..32ac1de61d35801680b8e5c8fc55d07b2c5ee70d 100644

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

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

@@ -59,7 +59,8 @@ void MockMediaStreamDispatcher::EnumerateDevices(

int request_id,

const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,

MediaStreamType type,

- const GURL& security_origin) {

+ const GURL& security_origin,

+ bool hide_labels_if_no_access) {

if (type == MEDIA_DEVICE_AUDIO_CAPTURE) {

audio_input_request_id_ = request_id;

audio_input_array_.clear();

« no previous file with comments | « content/renderer/media/mock_media_stream_dispatcher.h ('k') | content/renderer/pepper/pepper_media_device_manager.cc » ('j') | no next file with comments »