| Index: ppapi/proxy/ppapi_messages.h
|
| diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
|
| index 60018a6f3e0b371ce22e68f36604b56c778940df..99b6e6c03192098790bda1bf67b7287badf86c5f 100644
|
| --- a/ppapi/proxy/ppapi_messages.h
|
| +++ b/ppapi/proxy/ppapi_messages.h
|
| @@ -54,6 +54,7 @@
|
| #include "ppapi/proxy/serialized_var.h"
|
| #include "ppapi/shared_impl/dir_contents.h"
|
| #include "ppapi/shared_impl/file_path.h"
|
| +#include "ppapi/shared_impl/ppapi_nacl_channel_args.h"
|
| #include "ppapi/shared_impl/ppapi_preferences.h"
|
| #include "ppapi/shared_impl/ppb_device_ref_shared.h"
|
| #include "ppapi/shared_impl/ppb_input_event_shared.h"
|
| @@ -292,6 +293,13 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::NetworkInfo)
|
| IPC_STRUCT_TRAITS_MEMBER(mtu)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(ppapi::PpapiNaClChannelArgs)
|
| + IPC_STRUCT_TRAITS_MEMBER(off_the_record)
|
| + IPC_STRUCT_TRAITS_MEMBER(permissions)
|
| + IPC_STRUCT_TRAITS_MEMBER(switch_names)
|
| + IPC_STRUCT_TRAITS_MEMBER(switch_values)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| #if !defined(OS_NACL) && !defined(NACL_WIN64)
|
|
|
| IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPDecryptor_Buffer)
|
| @@ -318,10 +326,9 @@ IPC_MESSAGE_CONTROL3(PpapiMsg_CreateChannel,
|
| // Creates a channel to talk to a renderer. This message is only used by the
|
| // NaCl IPC proxy. It is intercepted by NaClIPCAdapter, which creates the
|
| // actual channel and rewrites the message for the untrusted side.
|
| -IPC_MESSAGE_CONTROL4(PpapiMsg_CreateNaClChannel,
|
| +IPC_MESSAGE_CONTROL3(PpapiMsg_CreateNaClChannel,
|
| int /* renderer_id */,
|
| - ppapi::PpapiPermissions /* permissions */,
|
| - bool /* incognito */,
|
| + ppapi::PpapiNaClChannelArgs /* args */,
|
| ppapi::proxy::SerializedHandle /* channel_handle */)
|
|
|
| // Instructs the plugin process to crash.
|
|
|