| Index: content/common/view_messages.h
|
| diff --git a/content/common/view_messages.h b/content/common/view_messages.h
|
| index 13c5d8da40bd634d7cd94a9cdcae73b92ff346ce..c439a35db72a7fd89a8aa8515fde4adf42e3d9cf 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)
|
| @@ -2023,3 +2032,6 @@ IPC_MESSAGE_ROUTED3(ViewHostMsg_SendSerializedHtmlData,
|
| // being sent back.
|
| IPC_MESSAGE_ROUTED0(ViewHostMsg_RequestRemoteAccessClientFirewallTraversal)
|
|
|
| +// Notifies the browser of an event occurring in the media pipeline.
|
| +IPC_MESSAGE_CONTROL1(ViewHostMsg_MediaLogEvent,
|
| + media::MediaLogEvent /* event */)
|
|
|