diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 17:39:07 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 17:39:07 +0000 |
| commit | 1d232b98fb18de71f7cc000c2f845c610efe113b (patch) | |
| tree | 9a71becc1986a4c5236c956f6632450396dd1639 /content/common/media/media_stream_messages.h | |
| parent | 596c61c153d7b113fee76160c20f4865b834b0ac (diff) | |
| download | chromium_src-1d232b98fb18de71f7cc000c2f845c610efe113b.zip chromium_src-1d232b98fb18de71f7cc000c2f845c610efe113b.tar.gz chromium_src-1d232b98fb18de71f7cc000c2f845c610efe113b.tar.bz2 | |
Move content\browser\renderer_host\media to content namespace.
TBR=tfarina
Review URL: https://codereview.chromium.org/11339014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164670 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 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/content/common/media/media_stream_messages.h b/content/common/media/media_stream_messages.h index 054f83e..658eb48 100644 --- a/content/common/media/media_stream_messages.h +++ b/content/common/media/media_stream_messages.h @@ -16,16 +16,16 @@ #define IPC_MESSAGE_EXPORT CONTENT_EXPORT #define IPC_MESSAGE_START MediaStreamMsgStart -IPC_ENUM_TRAITS(media_stream::MediaStreamType) +IPC_ENUM_TRAITS(content::MediaStreamType) -IPC_STRUCT_TRAITS_BEGIN(media_stream::StreamOptions) +IPC_STRUCT_TRAITS_BEGIN(content::StreamOptions) IPC_STRUCT_TRAITS_MEMBER(audio_type) IPC_STRUCT_TRAITS_MEMBER(audio_device_id) IPC_STRUCT_TRAITS_MEMBER(video_type) IPC_STRUCT_TRAITS_MEMBER(video_device_id) IPC_STRUCT_TRAITS_END() -IPC_STRUCT_TRAITS_BEGIN(media_stream::StreamDeviceInfo) +IPC_STRUCT_TRAITS_BEGIN(content::StreamDeviceInfo) IPC_STRUCT_TRAITS_MEMBER(stream_type) IPC_STRUCT_TRAITS_MEMBER(name) IPC_STRUCT_TRAITS_MEMBER(device_id) @@ -39,8 +39,8 @@ IPC_STRUCT_TRAITS_END() IPC_MESSAGE_ROUTED4(MediaStreamMsg_StreamGenerated, int /* request id */, std::string /* label */, - media_stream::StreamDeviceInfoArray /* audio_device_list */, - media_stream::StreamDeviceInfoArray /* video_device_list */) + content::StreamDeviceInfoArray /* audio_device_list */, + content::StreamDeviceInfoArray /* video_device_list */) // The browser has failed to generate a stream. IPC_MESSAGE_ROUTED1(MediaStreamMsg_StreamGenerationFailed, @@ -50,7 +50,7 @@ IPC_MESSAGE_ROUTED1(MediaStreamMsg_StreamGenerationFailed, IPC_MESSAGE_ROUTED3(MediaStreamMsg_DevicesEnumerated, int /* request id */, std::string /* label */, - media_stream::StreamDeviceInfoArray /* device_list */) + content::StreamDeviceInfoArray /* device_list */) // The browser has failed to enumerate devices. IPC_MESSAGE_ROUTED1(MediaStreamMsg_DevicesEnumerationFailed, @@ -62,7 +62,7 @@ IPC_MESSAGE_ROUTED1(MediaStreamMsg_DevicesEnumerationFailed, IPC_MESSAGE_ROUTED3(MediaStreamMsg_DeviceOpened, int /* request id */, std::string /* label */, - media_stream::StreamDeviceInfo /* the device */) + content::StreamDeviceInfo /* the device */) // The browser has failed to open a device. IPC_MESSAGE_ROUTED1(MediaStreamMsg_DeviceOpenFailed, @@ -74,7 +74,7 @@ IPC_MESSAGE_ROUTED1(MediaStreamMsg_DeviceOpenFailed, IPC_MESSAGE_CONTROL4(MediaStreamHostMsg_GenerateStream, int /* render view id */, int /* request id */, - media_stream::StreamOptions /* components */, + content::StreamOptions /* components */, GURL /* security origin */) // Request to cancel the request for a new media stream. @@ -91,7 +91,7 @@ IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_StopGeneratedStream, IPC_MESSAGE_CONTROL4(MediaStreamHostMsg_EnumerateDevices, int /* render view id */, int /* request id */, - media_stream::MediaStreamType /* type */, + content::MediaStreamType /* type */, GURL /* security origin */) // Request to open the device. @@ -99,5 +99,5 @@ IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice, int /* render view id */, int /* request id */, std::string /* device_id */, - media_stream::MediaStreamType /* type */, + content::MediaStreamType /* type */, GURL /* security origin */) |