content/common/media/media_stream_messages.h - Issue 10912004: Begin adding support for tab mirroring via the MediaStream audio/video capturing

Side by Side Diff: content/common/media/media_stream_messages.h

Issue 10912004: Begin adding support for tab mirroring via the MediaStream audio/video capturing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Changes after review by xians@. Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log

« content/browser/renderer_host/media/media_stream_manager.cc ('K') | « content/browser/renderer_host/media/video_capture_manager_unittest.cc ('k') | content/common/media/media_stream_options.h » ('j') | content/public/common/media_stream_request.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 // IPC messages for the media streaming.	5 // IPC messages for the media streaming.

6 // Multiply-included message file, hence no include guard.	6 // Multiply-included message file, hence no include guard.

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "content/common/content_export.h"	10 #include "content/common/content_export.h"

11 #include "content/common/media/media_stream_options.h"	11 #include "content/common/media/media_stream_options.h"

12 #include "googleurl/src/gurl.h"	12 #include "googleurl/src/gurl.h"

13 #include "ipc/ipc_message_macros.h"	13 #include "ipc/ipc_message_macros.h"

14	14

15 #undef IPC_MESSAGE_EXPORT	15 #undef IPC_MESSAGE_EXPORT

16 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT	16 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT

17 #define IPC_MESSAGE_START MediaStreamMsgStart	17 #define IPC_MESSAGE_START MediaStreamMsgStart

18	18

19 IPC_ENUM_TRAITS(media_stream::MediaStreamType)	19 IPC_ENUM_TRAITS(media_stream::MediaStreamType)

20	20

21 IPC_STRUCT_TRAITS_BEGIN(media_stream::StreamOptions)	21 IPC_STRUCT_TRAITS_BEGIN(media_stream::StreamOptions)

22 IPC_STRUCT_TRAITS_MEMBER(audio)	22 IPC_STRUCT_TRAITS_MEMBER(audio_type)

23 IPC_STRUCT_TRAITS_MEMBER(video)	23 IPC_STRUCT_TRAITS_MEMBER(video_type)

	24 IPC_STRUCT_TRAITS_MEMBER(opt_device_id)

24 IPC_STRUCT_TRAITS_END()	25 IPC_STRUCT_TRAITS_END()

25	26

26 IPC_STRUCT_TRAITS_BEGIN(media_stream::StreamDeviceInfo)	27 IPC_STRUCT_TRAITS_BEGIN(media_stream::StreamDeviceInfo)

27 IPC_STRUCT_TRAITS_MEMBER(stream_type)	28 IPC_STRUCT_TRAITS_MEMBER(stream_type)

28 IPC_STRUCT_TRAITS_MEMBER(name)	29 IPC_STRUCT_TRAITS_MEMBER(name)

29 IPC_STRUCT_TRAITS_MEMBER(device_id)	30 IPC_STRUCT_TRAITS_MEMBER(device_id)

30 IPC_STRUCT_TRAITS_MEMBER(in_use)	31 IPC_STRUCT_TRAITS_MEMBER(in_use)

31 IPC_STRUCT_TRAITS_MEMBER(session_id)	32 IPC_STRUCT_TRAITS_MEMBER(session_id)

32 IPC_STRUCT_TRAITS_END()	33 IPC_STRUCT_TRAITS_END()

33	34

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102 media_stream::MediaStreamType /* type */,	103 media_stream::MediaStreamType /* type */,

103 GURL /* security origin */)	104 GURL /* security origin */)

104	105

105 // Request to open the device.	106 // Request to open the device.

106 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice,	107 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice,

107 int /* render view id */,	108 int /* render view id */,

108 int /* request id */,	109 int /* request id */,

109 std::string /* device_id */,	110 std::string /* device_id */,

110 media_stream::MediaStreamType /* type */,	111 media_stream::MediaStreamType /* type */,

111 GURL /* security origin */)	112 GURL /* security origin */)

OLD	NEW