| 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 25 matching lines...) Expand all Loading... |
| 36 #include "ppapi/c/private/ppb_tcp_socket_private.h" | 36 #include "ppapi/c/private/ppb_tcp_socket_private.h" |
| 37 #include "ppapi/proxy/ppapi_param_traits.h" | 37 #include "ppapi/proxy/ppapi_param_traits.h" |
| 38 #include "ppapi/proxy/ppapi_proxy_export.h" | 38 #include "ppapi/proxy/ppapi_proxy_export.h" |
| 39 #include "ppapi/proxy/serialized_flash_menu.h" | 39 #include "ppapi/proxy/serialized_flash_menu.h" |
| 40 #include "ppapi/proxy/serialized_structs.h" | 40 #include "ppapi/proxy/serialized_structs.h" |
| 41 #include "ppapi/shared_impl/ppapi_preferences.h" | 41 #include "ppapi/shared_impl/ppapi_preferences.h" |
| 42 #include "ppapi/shared_impl/ppb_device_ref_shared.h" | 42 #include "ppapi/shared_impl/ppb_device_ref_shared.h" |
| 43 #include "ppapi/shared_impl/ppb_input_event_shared.h" | 43 #include "ppapi/shared_impl/ppb_input_event_shared.h" |
| 44 #include "ppapi/shared_impl/ppb_url_request_info_shared.h" | 44 #include "ppapi/shared_impl/ppb_url_request_info_shared.h" |
| 45 #include "ppapi/shared_impl/ppb_view_shared.h" | 45 #include "ppapi/shared_impl/ppb_view_shared.h" |
| 46 #include "ppapi/shared_impl/private/ppb_flash_x509_certificate_shared.h" |
| 46 #include "ppapi/shared_impl/private/ppb_host_resolver_shared.h" | 47 #include "ppapi/shared_impl/private/ppb_host_resolver_shared.h" |
| 47 | 48 |
| 48 #undef IPC_MESSAGE_EXPORT | 49 #undef IPC_MESSAGE_EXPORT |
| 49 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT | 50 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT |
| 50 | 51 |
| 51 #define IPC_MESSAGE_START PpapiMsgStart | 52 #define IPC_MESSAGE_START PpapiMsgStart |
| 52 | 53 |
| 53 IPC_ENUM_TRAITS(PP_DeviceType_Dev) | 54 IPC_ENUM_TRAITS(PP_DeviceType_Dev) |
| 54 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton) | 55 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton) |
| 55 IPC_ENUM_TRAITS(PP_InputEvent_Type) | 56 IPC_ENUM_TRAITS(PP_InputEvent_Type) |
| (...skipping 1237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1293 uint32 /* plugin_dispatcher_id */, | 1294 uint32 /* plugin_dispatcher_id */, |
| 1294 PP_Resource /* socket_resource */, | 1295 PP_Resource /* socket_resource */, |
| 1295 PP_NetAddress_Private /* addr */, | 1296 PP_NetAddress_Private /* addr */, |
| 1296 int32_t /* backlog */) | 1297 int32_t /* backlog */) |
| 1297 IPC_MESSAGE_CONTROL2(PpapiHostMsg_PPBTCPServerSocket_Accept, | 1298 IPC_MESSAGE_CONTROL2(PpapiHostMsg_PPBTCPServerSocket_Accept, |
| 1298 int32 /* tcp_client_socket_routing_id */, | 1299 int32 /* tcp_client_socket_routing_id */, |
| 1299 uint32 /* server_socket_id */) | 1300 uint32 /* server_socket_id */) |
| 1300 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Destroy, | 1301 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Destroy, |
| 1301 uint32 /* socket_id */) | 1302 uint32 /* socket_id */) |
| 1302 | 1303 |
| 1304 // PPB_Flash_X509_Certificate |
| 1305 IPC_SYNC_MESSAGE_CONTROL1_2(PpapiHostMsg_PPBX509Certificate_ParseDER, |
| 1306 std::vector<char> /* der */, |
| 1307 bool /* succeeded */, |
| 1308 ppapi::PPB_X509Certificate_Fields /* result */) |
| 1309 |
| 1303 // PPB_Font. | 1310 // PPB_Font. |
| 1304 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies, | 1311 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies, |
| 1305 std::string /* result */) | 1312 std::string /* result */) |
| 1306 #endif // !defined(OS_NACL) | 1313 #endif // !defined(OS_NACL) |
| OLD | NEW |