diff options
| author | grunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 03:30:39 +0000 |
|---|---|---|
| committer | grunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 03:31:56 +0000 |
| commit | f559212126d890b4ac21cf20caeeaad363362f89 (patch) | |
| tree | 23f443e3889ee41e35d3d9265e12196d56a42b1a /content/common/media/media_stream_messages.h | |
| parent | d89dd2646dba02681ddb16ea5c291d5ac3ebc377 (diff) | |
| download | chromium_src-f559212126d890b4ac21cf20caeeaad363362f89.zip chromium_src-f559212126d890b4ac21cf20caeeaad363362f89.tar.gz chromium_src-f559212126d890b4ac21cf20caeeaad363362f89.tar.bz2 | |
Enforce empty device labels for pepper flash when enumerating devices if permission to access the device type hasn't been granted.
This reverts https://codereview.chromium.org/323313003/
BUG=402802
Review URL: https://codereview.chromium.org/469713003
Cr-Commit-Position: refs/heads/master@{#289766}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/media/media_stream_messages.h')
| -rw-r--r-- | content/common/media/media_stream_messages.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/content/common/media/media_stream_messages.h b/content/common/media/media_stream_messages.h index e88aeab..9434a6d 100644 --- a/content/common/media/media_stream_messages.h +++ b/content/common/media/media_stream_messages.h @@ -128,12 +128,11 @@ IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_GetSources, // Request to enumerate devices. // Used by Pepper and WebRTC. -IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_EnumerateDevices, +IPC_MESSAGE_CONTROL4(MediaStreamHostMsg_EnumerateDevices, int /* render frame id */, int /* request id */, content::MediaStreamType /* type */, - GURL /* security origin */, - bool /* hide_labels_if_no_access */) + GURL /* security origin */) // Request to stop enumerating devices. IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelEnumerateDevices, |