| Index: ppapi/proxy/ppapi_messages.h
|
| diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
|
| index 2872bd7b23ef9572d1f1222db6a8b1ad7358cda9..66cd85555be5065e0e7d30aa10c067d789f5b036 100644
|
| --- a/ppapi/proxy/ppapi_messages.h
|
| +++ b/ppapi/proxy/ppapi_messages.h
|
| @@ -39,6 +39,7 @@
|
| #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"
|
| +#include "ppapi/shared_impl/ppb_network_list_private_shared.h"
|
| #include "ppapi/shared_impl/ppb_url_request_info_shared.h"
|
| #include "ppapi/shared_impl/ppb_view_shared.h"
|
|
|
| @@ -53,6 +54,8 @@ IPC_ENUM_TRAITS(PP_InputEvent_MouseButton)
|
| IPC_ENUM_TRAITS(PP_TextInput_Type)
|
| IPC_ENUM_TRAITS(PP_VideoDecoder_Profile)
|
| IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev)
|
| +IPC_ENUM_TRAITS(PP_NetworkListType_Private)
|
| +IPC_ENUM_TRAITS(PP_NetworkListState_Private)
|
|
|
| IPC_STRUCT_TRAITS_BEGIN(PP_Point)
|
| IPC_STRUCT_TRAITS_MEMBER(x)
|
| @@ -174,6 +177,15 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::PPB_URLRequestInfo_Data::BodyItem)
|
| IPC_STRUCT_TRAITS_MEMBER(expected_last_modified_time)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(ppapi::NetworkInfo)
|
| + IPC_STRUCT_TRAITS_MEMBER(name)
|
| + IPC_STRUCT_TRAITS_MEMBER(type)
|
| + IPC_STRUCT_TRAITS_MEMBER(state)
|
| + IPC_STRUCT_TRAITS_MEMBER(addresses)
|
| + IPC_STRUCT_TRAITS_MEMBER(display_name)
|
| + IPC_STRUCT_TRAITS_MEMBER(mtu)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| // These are from the browser to the plugin.
|
| // Loads the given plugin.
|
| IPC_MESSAGE_CONTROL1(PpapiMsg_LoadPlugin, FilePath /* path */)
|
| @@ -295,6 +307,11 @@ IPC_MESSAGE_ROUTED2(
|
| ppapi::HostResource /* filesystem */,
|
| int32_t /* result */)
|
|
|
| +// PPB_NetworkMonitor_Private.
|
| +IPC_MESSAGE_ROUTED2(PpapiMsg_PPBNetworkMonitor_NetworkList,
|
| + uint32 /* plugin_dispatcher_id */,
|
| + ppapi::NetworkList /* network_list */)
|
| +
|
| // PPB_TCPSocket_Private.
|
| IPC_MESSAGE_ROUTED5(PpapiMsg_PPBTCPSocket_ConnectACK,
|
| uint32 /* plugin_dispatcher_id */,
|
| @@ -727,6 +744,12 @@ IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBFileSystem_Open,
|
| ppapi::HostResource /* result */,
|
| int64_t /* expected_size */)
|
|
|
| +// PPB_NetworkMonitor_Private.
|
| +IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBNetworkMonitor_Start,
|
| + uint32 /* plugin_dispatcher_id */)
|
| +IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBNetworkMonitor_Stop,
|
| + uint32 /* plugin_dispatcher_id */)
|
| +
|
| // PPB_Graphics2D.
|
| IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBGraphics2D_Create,
|
| PP_Instance /* instance */,
|
| @@ -1259,4 +1282,3 @@ IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Destroy,
|
| IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies,
|
| std::string /* result */)
|
| #endif // !defined(OS_NACL)
|
| -
|
|
|