content/common/media/media_stream_messages.h - 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/common/media/media_stream_messages.h

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/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc ('k') | content/renderer/media/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/common/media/media_stream_messages.h

diff --git a/content/common/media/media_stream_messages.h b/content/common/media/media_stream_messages.h

index 0afa9ecd07fdfe962658916d43b0245a3dd9f0d8..609975965527f02d6502366ffa476c820defa31e 100644

--- a/content/common/media/media_stream_messages.h

+++ b/content/common/media/media_stream_messages.h

@@ -135,15 +135,14 @@ IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_GetSources,

int /* request id */,

GURL /* origin */)

// Request to enumerate devices.

-// Used by Pepper.

-// TODO(vrk,wjia): Move this to pepper code.

-IPC_MESSAGE_CONTROL4(MediaStreamHostMsg_EnumerateDevices,

+// Used by Pepper and WebRTC.

+IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_EnumerateDevices,

int /* render view id */,

int /* request id */,

content::MediaStreamType /* type */,

- GURL /* security origin */)

+ GURL /* security origin */,

+ bool /* hide_labels_if_no_access */)

// Request to stop enumerating devices.

IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelEnumerateDevices,