| 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 27 matching lines...) Expand all Loading... |
| 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_network_list_private_shared.h" | 44 #include "ppapi/shared_impl/ppb_network_list_private_shared.h" |
| 45 #include "ppapi/shared_impl/ppb_url_request_info_shared.h" | 45 #include "ppapi/shared_impl/ppb_url_request_info_shared.h" |
| 46 #include "ppapi/shared_impl/ppb_view_shared.h" | 46 #include "ppapi/shared_impl/ppb_view_shared.h" |
| 47 #include "ppapi/shared_impl/private/ppb_host_resolver_shared.h" | 47 #include "ppapi/shared_impl/private/ppb_host_resolver_shared.h" |
| 48 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" |
| 48 | 49 |
| 49 #undef IPC_MESSAGE_EXPORT | 50 #undef IPC_MESSAGE_EXPORT |
| 50 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT | 51 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT |
| 51 | 52 |
| 52 #define IPC_MESSAGE_START PpapiMsgStart | 53 #define IPC_MESSAGE_START PpapiMsgStart |
| 53 | 54 |
| 54 IPC_ENUM_TRAITS(PP_DeviceType_Dev) | 55 IPC_ENUM_TRAITS(PP_DeviceType_Dev) |
| 55 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton) | 56 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton) |
| 56 IPC_ENUM_TRAITS(PP_InputEvent_Type) | 57 IPC_ENUM_TRAITS(PP_InputEvent_Type) |
| 57 IPC_ENUM_TRAITS(PP_NetAddressFamily_Private) | 58 IPC_ENUM_TRAITS(PP_NetAddressFamily_Private) |
| (...skipping 1251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1309 uint32 /* plugin_dispatcher_id */, | 1310 uint32 /* plugin_dispatcher_id */, |
| 1310 PP_Resource /* socket_resource */, | 1311 PP_Resource /* socket_resource */, |
| 1311 PP_NetAddress_Private /* addr */, | 1312 PP_NetAddress_Private /* addr */, |
| 1312 int32_t /* backlog */) | 1313 int32_t /* backlog */) |
| 1313 IPC_MESSAGE_CONTROL2(PpapiHostMsg_PPBTCPServerSocket_Accept, | 1314 IPC_MESSAGE_CONTROL2(PpapiHostMsg_PPBTCPServerSocket_Accept, |
| 1314 int32 /* tcp_client_socket_routing_id */, | 1315 int32 /* tcp_client_socket_routing_id */, |
| 1315 uint32 /* server_socket_id */) | 1316 uint32 /* server_socket_id */) |
| 1316 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Destroy, | 1317 IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPServerSocket_Destroy, |
| 1317 uint32 /* socket_id */) | 1318 uint32 /* socket_id */) |
| 1318 | 1319 |
| 1320 // PPB_X509Certificate_Private |
| 1321 IPC_SYNC_MESSAGE_CONTROL1_2(PpapiHostMsg_PPBX509Certificate_ParseDER, |
| 1322 std::vector<char> /* der */, |
| 1323 bool /* succeeded */, |
| 1324 ppapi::PPB_X509Certificate_Fields /* result */) |
| 1325 |
| 1319 // PPB_Font. | 1326 // PPB_Font. |
| 1320 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies, | 1327 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies, |
| 1321 std::string /* result */) | 1328 std::string /* result */) |
| 1322 #endif // !defined(OS_NACL) | 1329 #endif // !defined(OS_NACL) |
| OLD | NEW |