| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Multiply-included message header, no traditional include guard. | 5 // Multiply-included message header, no traditional include guard. |
| 6 #include <string> | 6 #include <string> |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 #include "ppapi/c/private/ppb_tcp_socket_private.h" | 34 #include "ppapi/c/private/ppb_tcp_socket_private.h" |
| 35 #include "ppapi/proxy/ppapi_param_traits.h" | 35 #include "ppapi/proxy/ppapi_param_traits.h" |
| 36 #include "ppapi/proxy/ppapi_proxy_export.h" | 36 #include "ppapi/proxy/ppapi_proxy_export.h" |
| 37 #include "ppapi/proxy/serialized_flash_menu.h" | 37 #include "ppapi/proxy/serialized_flash_menu.h" |
| 38 #include "ppapi/proxy/serialized_structs.h" | 38 #include "ppapi/proxy/serialized_structs.h" |
| 39 #include "ppapi/shared_impl/ppapi_preferences.h" | 39 #include "ppapi/shared_impl/ppapi_preferences.h" |
| 40 #include "ppapi/shared_impl/ppb_device_ref_shared.h" | 40 #include "ppapi/shared_impl/ppb_device_ref_shared.h" |
| 41 #include "ppapi/shared_impl/ppb_input_event_shared.h" | 41 #include "ppapi/shared_impl/ppb_input_event_shared.h" |
| 42 #include "ppapi/shared_impl/ppb_url_request_info_shared.h" | 42 #include "ppapi/shared_impl/ppb_url_request_info_shared.h" |
| 43 #include "ppapi/shared_impl/ppb_view_shared.h" | 43 #include "ppapi/shared_impl/ppb_view_shared.h" |
| 44 #include "ppapi/shared_impl/private/ppb_flash_x509_certificate_shared.h" |
| 44 | 45 |
| 45 #undef IPC_MESSAGE_EXPORT | 46 #undef IPC_MESSAGE_EXPORT |
| 46 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT | 47 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT |
| 47 | 48 |
| 48 #define IPC_MESSAGE_START PpapiMsgStart | 49 #define IPC_MESSAGE_START PpapiMsgStart |
| 49 | 50 |
| 50 IPC_ENUM_TRAITS(PP_DeviceType_Dev) | 51 IPC_ENUM_TRAITS(PP_DeviceType_Dev) |
| 51 IPC_ENUM_TRAITS(PP_InputEvent_Type) | 52 IPC_ENUM_TRAITS(PP_InputEvent_Type) |
| 52 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton) | 53 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton) |
| 53 IPC_ENUM_TRAITS(PP_TextInput_Type) | 54 IPC_ENUM_TRAITS(PP_TextInput_Type) |
| (...skipping 1194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1248 int32 /* routing_id */, | 1249 int32 /* routing_id */, |
| 1249 uint32 /* plugin_dispatcher_id */, | 1250 uint32 /* plugin_dispatcher_id */, |
| 1250 uint32 /* temp_socket_id */, | 1251 uint32 /* temp_socket_id */, |
| 1251 PP_NetAddress_Private /* addr */, | 1252 PP_NetAddress_Private /* addr */, |
| 1252 int32_t /* backlog */) | 1253 int32_t /* backlog */) |
| 1253 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Accept, | 1254 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Accept, |
| 1254 uint32 /* real_socket_id */) | 1255 uint32 /* real_socket_id */) |
| 1255 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Destroy, | 1256 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Destroy, |
| 1256 uint32 /* real_socket_id */) | 1257 uint32 /* real_socket_id */) |
| 1257 | 1258 |
| 1259 // PPB_Flash_X509_Certificate |
| 1260 IPC_SYNC_MESSAGE_CONTROL1_2(PpapiHostMsg_PPBX509Certificate_ParseDER, |
| 1261 std::vector<char> /* der */, |
| 1262 bool /* succeeded */, |
| 1263 ppapi::PPB_X509Certificate_Fields /* result */) |
| 1264 |
| 1258 // PPB_Font. | 1265 // PPB_Font. |
| 1259 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies, | 1266 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies, |
| 1260 std::string /* result */) | 1267 std::string /* result */) |
| 1261 #endif // !defined(OS_NACL) | 1268 #endif // !defined(OS_NACL) |
| 1262 | 1269 |
| OLD | NEW |