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

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

Unified 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: REBASE 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/media/video_capture_manager_unittest.cc ('k') | content/common/media/media_stream_options.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/media/media_stream_messages.h

diff --git a/content/common/media/media_stream_messages.h b/content/common/media/media_stream_messages.h

index 5c89f8d52d82726ad44a06bc6b346132bc657d3a..99314927516f3ffa2d7ac028c0dd7f19d72e302f 100644

--- a/content/common/media/media_stream_messages.h

+++ b/content/common/media/media_stream_messages.h

@@ -19,8 +19,8 @@

IPC_ENUM_TRAITS(media_stream::MediaStreamType)

IPC_STRUCT_TRAITS_BEGIN(media_stream::StreamOptions)

- IPC_STRUCT_TRAITS_MEMBER(audio)

- IPC_STRUCT_TRAITS_MEMBER(video)

+ IPC_STRUCT_TRAITS_MEMBER(audio_type)

+ IPC_STRUCT_TRAITS_MEMBER(video_type)

IPC_STRUCT_TRAITS_END()

IPC_STRUCT_TRAITS_BEGIN(media_stream::StreamDeviceInfo)

@@ -82,10 +82,18 @@ IPC_MESSAGE_ROUTED1(MediaStreamMsg_DeviceOpenFailed,

IPC_MESSAGE_CONTROL4(MediaStreamHostMsg_GenerateStream,

int /* render view id */,

int /* request id */,

- media_stream::StreamOptions /* options */,

+ media_stream::StreamOptions /* components */,

GURL /* security origin */)

-// Request to cancel the request for a new media stream.

+// Request a new media stream for a specific device.

+IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_GenerateStreamForDevice,

+ int /* render view id */,

+ int /* request id */,

+ media_stream::StreamOptions /* components */,

+ std::string /* device_id */,

+ GURL /* security origin */)

+// Request to cancel the request for a new media stream.

IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelGenerateStream,

int /* render view id */,

int /* request id */)