diff options
Diffstat (limited to 'chromium/content/common/media/media_stream_messages.h')
| -rw-r--r-- | chromium/content/common/media/media_stream_messages.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/chromium/content/common/media/media_stream_messages.h b/chromium/content/common/media/media_stream_messages.h index 8c4caf5a1b2..0d331709a1d 100644 --- a/chromium/content/common/media/media_stream_messages.h +++ b/chromium/content/common/media/media_stream_messages.h @@ -10,6 +10,7 @@ #include "content/common/content_export.h" #include "content/common/media/media_stream_options.h" #include "ipc/ipc_message_macros.h" +#include "ipc/ipc_platform_file.h" #include "url/gurl.h" #undef IPC_MESSAGE_EXPORT @@ -22,6 +23,9 @@ IPC_ENUM_TRAITS_MAX_VALUE(content::MediaStreamType, IPC_ENUM_TRAITS_MAX_VALUE(content::VideoFacingMode, content::NUM_MEDIA_VIDEO_FACING_MODE - 1) +IPC_ENUM_TRAITS_MAX_VALUE(content::MediaStreamRequestResult, + content::NUM_MEDIA_REQUEST_RESULTS - 1) + IPC_STRUCT_TRAITS_BEGIN(content::StreamOptions::Constraint) IPC_STRUCT_TRAITS_MEMBER(name) IPC_STRUCT_TRAITS_MEMBER(value) @@ -62,8 +66,9 @@ IPC_MESSAGE_ROUTED4(MediaStreamMsg_StreamGenerated, content::StreamDeviceInfoArray /* video_device_list */) // The browser has failed to generate a stream. -IPC_MESSAGE_ROUTED1(MediaStreamMsg_StreamGenerationFailed, - int /* request id */) +IPC_MESSAGE_ROUTED2(MediaStreamMsg_StreamGenerationFailed, + int /* request id */, + content::MediaStreamRequestResult /* result */) // The browser reports that a media device has been stopped. Stopping was // triggered from the browser process. @@ -99,11 +104,12 @@ IPC_MESSAGE_CONTROL2(MediaStreamMsg_GetSourcesACK, // Messages sent from the renderer to the browser. // Request a new media stream. -IPC_MESSAGE_CONTROL4(MediaStreamHostMsg_GenerateStream, +IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_GenerateStream, int /* render view id */, int /* request id */, content::StreamOptions /* components */, - GURL /* security origin */) + GURL /* security origin */, + bool /* user_gesture */) // Request to cancel the request for a new media stream. IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelGenerateStream, @@ -120,15 +126,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, |