content/common/media/media_stream_messages.h - Issue 18868005: content: Migrate from googleurl/ includes to url/ ones.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

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

Issue 18868005: content: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 5 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

« no previous file with comments | « content/common/media/media_player_messages_android.h ('k') | content/common/media/webrtc_identity_messages.h » ('j') | no next file with comments »

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"

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

	13 #include "url/gurl.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_MAX_VALUE(content::MediaStreamType,	19 IPC_ENUM_TRAITS_MAX_VALUE(content::MediaStreamType,

20 content::NUM_MEDIA_TYPES - 1)	20 content::NUM_MEDIA_TYPES - 1)

21	21

22 IPC_STRUCT_TRAITS_BEGIN(content::StreamOptions)	22 IPC_STRUCT_TRAITS_BEGIN(content::StreamOptions)

23 IPC_STRUCT_TRAITS_MEMBER(audio_type)	23 IPC_STRUCT_TRAITS_MEMBER(audio_type)

(...skipping 73 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
97 content::MediaStreamType /* type */,	97 content::MediaStreamType /* type */,

98 GURL /* security origin */)	98 GURL /* security origin */)

99	99

100 // Request to open the device.	100 // Request to open the device.

101 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice,	101 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice,

102 int /* render view id */,	102 int /* render view id */,

103 int /* request id */,	103 int /* request id */,

104 std::string /* device_id */,	104 std::string /* device_id */,

105 content::MediaStreamType /* type */,	105 content::MediaStreamType /* type */,

106 GURL /* security origin */)	106 GURL /* security origin */)

OLD	NEW