Index: content/common/view_messages.h |
diff --git a/content/common/view_messages.h b/content/common/view_messages.h |
index 0698af620236186c4e783c0761321913a1a99440..40222380e57edf82eadb01b1a510852cc27a54e6 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" |
@@ -172,6 +173,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) |
scherkus (not reviewing)
2011/08/08 21:20:51
nit: this looks like it should be in AZ order
|
IPC_STRUCT_TRAITS_BEGIN(ContextMenuParams) |
IPC_STRUCT_TRAITS_MEMBER(media_type) |
@@ -408,6 +410,13 @@ IPC_STRUCT_TRAITS_BEGIN(webkit::npapi::WebPluginInfo) |
IPC_STRUCT_TRAITS_MEMBER(enabled) |
IPC_STRUCT_TRAITS_END() |
+IPC_STRUCT_TRAITS_BEGIN(media::MediaLogEvent) |
scherkus (not reviewing)
2011/08/08 21:20:51
possibly ditto for this
|
+ 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) |
@@ -2028,3 +2037,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 */) |