Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index ebaeed90f1a419a6bc2e6e3f9996bb3f431f5b2d..e2a052f2b5738e89ed23ecc14b17164ad598da31 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -47,6 +47,7 @@ |
#include "ppapi/c/ppb_text_input_controller.h" |
#include "ppapi/c/ppb_udp_socket.h" |
#include "ppapi/c/ppb_video_encoder.h" |
+#include "ppapi/c/ppb_vpn_provider.h" |
#include "ppapi/c/private/pp_content_decryptor.h" |
#include "ppapi/c/private/pp_private_font_charset.h" |
#include "ppapi/c/private/pp_video_capture_format.h" |
@@ -136,6 +137,13 @@ IPC_ENUM_TRAITS_MAX_VALUE(PP_VideoFrame_Format, PP_VIDEOFRAME_FORMAT_LAST) |
IPC_ENUM_TRAITS_MAX_VALUE(PP_HardwareAcceleration, PP_HARDWAREACCELERATION_LAST) |
IPC_ENUM_TRAITS_MAX_VALUE(PP_AudioProfile, PP_AUDIOPROFILE_MAX) |
IPC_ENUM_TRAITS_MAX_VALUE(PP_VideoProfile, PP_VIDEOPROFILE_MAX) |
+IPC_ENUM_TRAITS_MAX_VALUE(PP_VpnProvider_PlatformMessage, |
+ PP_VPN_PROVIDER_PLATFORM_MESSAGE_LAST) |
+IPC_ENUM_TRAITS_MAX_VALUE(PP_VpnProvider_VpnConnectionState, |
+ PP_VPN_PROVIDER_CONNECTION_STATE_LAST) |
+IPC_ENUM_TRAITS_MAX_VALUE(PP_VpnProvider_UIEvent, PP_VPN_PROVIDER_UI_EVENT_LAST) |
+IPC_ENUM_TRAITS_MAX_VALUE(PP_VpnProvider_ConfigMessage, |
+ PP_VPN_PROVIDER_PLATFORM_MESSAGE_LAST) |
IPC_STRUCT_TRAITS_BEGIN(PP_Point) |
IPC_STRUCT_TRAITS_MEMBER(x) |
@@ -436,6 +444,17 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::SerializedNetworkInfo) |
IPC_STRUCT_TRAITS_MEMBER(mtu) |
IPC_STRUCT_TRAITS_END() |
+IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::SerializedVpnProviderParameters) |
+ IPC_STRUCT_TRAITS_MEMBER(address) |
+ IPC_STRUCT_TRAITS_MEMBER(subnet) |
+ IPC_STRUCT_TRAITS_MEMBER(exclusion_list) |
+ IPC_STRUCT_TRAITS_MEMBER(inclusion_list) |
+ IPC_STRUCT_TRAITS_MEMBER(dns_servers) |
+ IPC_STRUCT_TRAITS_MEMBER(mtu) |
+ IPC_STRUCT_TRAITS_MEMBER(broadcast_address) |
+ IPC_STRUCT_TRAITS_MEMBER(domain_search) |
+IPC_STRUCT_TRAITS_END() |
+ |
// Only whitelisted switches passed through PpapiNaClPluginArgs. |
// The list of switches can be found in: |
// components/nacl/browser/nacl_process_host.cc |
@@ -1982,6 +2001,49 @@ IPC_MESSAGE_CONTROL3(PpapiPluginMsg_VideoSource_GetFrameReply, |
PP_TimeTicks /* timestamp */) |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoSource_Close) |
+// VPN Provider ---------------------------------------------------------------- |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_VpnProvider_Create) |
+ |
+// PPB_VpnProvider Plugin --> Browser Messages |
+IPC_MESSAGE_CONTROL1(PpapiHostMsg_VpnProvider_CreateConfig, |
+ std::string /* name */) |
+IPC_MESSAGE_CONTROL1(PpapiHostMsg_VpnProvider_DestroyConfig, |
+ std::string /* id */) |
+IPC_MESSAGE_CONTROL1(PpapiHostMsg_VpnProvider_SetParameters, |
+ ppapi::proxy::SerializedVpnProviderParameters /* params */) |
+IPC_MESSAGE_CONTROL1(PpapiHostMsg_VpnProvider_SendPacket, |
+ std::vector<char> /* packet */) |
+IPC_MESSAGE_CONTROL1(PpapiHostMsg_VpnProvider_NotifyConnectionStateChanged, |
+ PP_VpnProvider_VpnConnectionState /* status */) |
+ |
+// PPB_VpnProvider Replies |
+IPC_MESSAGE_CONTROL2(PpapiPluginMsg_VpnProvider_CreateConfigReply, |
+ int32_t /* status */, |
+ std::string /* id */) |
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VpnProvider_DestroyConfigReply, |
+ int32_t /* status */) |
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VpnProvider_SetParametersReply, |
+ int32_t /* status */) |
+IPC_MESSAGE_CONTROL1( |
+ PpapiPluginMsg_VpnProvider_NotifyConnectionStateChangedReply, |
+ int32_t /* status */) |
+ |
+// PPP_VpnProvide Browser --> Plugin Messages |
+IPC_MESSAGE_CONTROL3(PpapiPluginMsg_VpnProvider_OnPlatformMessage, |
+ std::string /* id */, |
+ PP_VpnProvider_PlatformMessage /* status */, |
+ std::string /* message */) |
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VpnProvider_OnPacketReceived, |
+ std::vector<char> /* packet */) |
+IPC_MESSAGE_CONTROL4(PpapiPluginMsg_VpnProvider_OnConfigEvent, |
+ std::string /* id */, |
+ PP_VpnProvider_ConfigMessage /* message */, |
+ std::string /* name - additional payload for create */, |
+ std::string /* data - additional payload for create */) |
+IPC_MESSAGE_CONTROL2(PpapiPluginMsg_VpnProvider_OnUIEvent, |
+ PP_VpnProvider_UIEvent /* event */, |
+ std::string /* id */) |
+ |
// WebSocket ------------------------------------------------------------------- |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_WebSocket_Create) |