content/renderer/media/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/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: 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.h ('k') | content/renderer/media/media_stream_dispatcher_unittest.cc » ('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_dispatcher.cc

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

index 0a2da78e8bd95f12f8453220e36af8661fba0758..2f93d53de9a8bd99b68e82dd41ea343856ee584e 100644

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

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

@@ -134,7 +134,8 @@ void MediaStreamDispatcher::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) {

DCHECK(main_loop_->BelongsToCurrentThread());

DCHECK(type == MEDIA_DEVICE_AUDIO_CAPTURE ||

type == MEDIA_DEVICE_VIDEO_CAPTURE ||

@@ -151,7 +152,8 @@ void MediaStreamDispatcher::EnumerateDevices(

Send(new MediaStreamHostMsg_EnumerateDevices(routing_id(),

next_ipc_id_++,

type,

- security_origin));

+ security_origin,

+ hide_labels_if_no_access));

}

void MediaStreamDispatcher::StopEnumerateDevices(