content/common/view_messages.h - Issue 7480032: Plumb media data from renderers up to MediaInternals in the browser process.

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/view_messages.h

Issue 7480032: Plumb media data from renderers up to MediaInternals in the browser process. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Responding to feedback. Created 9 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 side-by-side diff with in-line comments

Download patch

« content/browser/renderer_host/media/media_observer.h ('K') | « content/browser/renderer_host/render_message_filter.cc ('k') | content/content_renderer.gypi » ('j') | content/renderer/media/render_media_log.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/view_messages.h

diff --git a/content/common/view_messages.h b/content/common/view_messages.h

index 8915554d78b334d865fd2cfecabf7b282f5e2991..8b43ca64eb45a51a47e84ed3a2efbdafb14dfad9 100644

--- a/content/common/view_messages.h

+++ b/content/common/view_messages.h

@@ -18,6 +18,7 @@

#include "content/common/window_container_type.h"

#include "ipc/ipc_message_macros.h"

#include "ipc/ipc_platform_file.h"

+#include "media/base/media_log_event.h"

#include "net/base/host_port_pair.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h"

@@ -171,6 +172,7 @@ IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::IntAttribute)

IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::Role)

IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::State)

IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::StringAttribute)

+IPC_ENUM_TRAITS(media::MediaLogEvent::Type)

IPC_STRUCT_TRAITS_BEGIN(ContextMenuParams)

IPC_STRUCT_TRAITS_MEMBER(media_type)

@@ -406,6 +408,13 @@ IPC_STRUCT_TRAITS_BEGIN(webkit::npapi::WebPluginInfo)

IPC_STRUCT_TRAITS_MEMBER(enabled)

IPC_STRUCT_TRAITS_END()

+IPC_STRUCT_TRAITS_BEGIN(media::MediaLogEvent)

+ IPC_STRUCT_TRAITS_MEMBER(id)

+ IPC_STRUCT_TRAITS_MEMBER(type)

+ IPC_STRUCT_TRAITS_MEMBER(params)

+ IPC_STRUCT_TRAITS_MEMBER(time)

+IPC_STRUCT_TRAITS_END()

IPC_STRUCT_BEGIN(ViewHostMsg_CreateWindow_Params)

// Routing ID of the view initiating the open.

IPC_STRUCT_MEMBER(int, opener_id)

@@ -2004,3 +2013,7 @@ IPC_MESSAGE_ROUTED3(ViewHostMsg_SendSerializedHtmlData,

GURL /* frame's url */,

std::string /* data buffer */,

int32 /* complete status */)

+// Notifies the browser of an event occurring in the media pipeline.

+IPC_MESSAGE_CONTROL1(ViewHostMsg_MediaLogEvent,

+ media::MediaLogEvent /* event */)