Chromium Code Reviews| 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 29 matching lines...) Expand all Loading... | |
| 40 #include "ppapi/c/private/ppb_net_address_private.h" | 40 #include "ppapi/c/private/ppb_net_address_private.h" |
| 41 #include "ppapi/c/private/ppb_tcp_socket_private.h" | 41 #include "ppapi/c/private/ppb_tcp_socket_private.h" |
| 42 #include "ppapi/c/private/ppb_udp_socket_private.h" | 42 #include "ppapi/c/private/ppb_udp_socket_private.h" |
| 43 #include "ppapi/c/private/ppp_flash_browser_operations.h" | 43 #include "ppapi/c/private/ppp_flash_browser_operations.h" |
| 44 #include "ppapi/proxy/ppapi_param_traits.h" | 44 #include "ppapi/proxy/ppapi_param_traits.h" |
| 45 #include "ppapi/proxy/ppapi_proxy_export.h" | 45 #include "ppapi/proxy/ppapi_proxy_export.h" |
| 46 #include "ppapi/proxy/resource_message_params.h" | 46 #include "ppapi/proxy/resource_message_params.h" |
| 47 #include "ppapi/proxy/serialized_flash_menu.h" | 47 #include "ppapi/proxy/serialized_flash_menu.h" |
| 48 #include "ppapi/proxy/serialized_structs.h" | 48 #include "ppapi/proxy/serialized_structs.h" |
| 49 #include "ppapi/proxy/serialized_var.h" | 49 #include "ppapi/proxy/serialized_var.h" |
| 50 #include "ppapi/shared_impl/dir_contents.h" | |
| 51 #include "ppapi/shared_impl/file_path.h" | |
| 50 #include "ppapi/shared_impl/ppapi_preferences.h" | 52 #include "ppapi/shared_impl/ppapi_preferences.h" |
| 51 #include "ppapi/shared_impl/ppb_device_ref_shared.h" | 53 #include "ppapi/shared_impl/ppb_device_ref_shared.h" |
| 52 #include "ppapi/shared_impl/ppb_input_event_shared.h" | 54 #include "ppapi/shared_impl/ppb_input_event_shared.h" |
| 53 #include "ppapi/shared_impl/ppb_network_list_private_shared.h" | 55 #include "ppapi/shared_impl/ppb_network_list_private_shared.h" |
| 54 #include "ppapi/shared_impl/ppb_view_shared.h" | 56 #include "ppapi/shared_impl/ppb_view_shared.h" |
| 55 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h" | 57 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h" |
| 56 #include "ppapi/shared_impl/private/ppb_host_resolver_shared.h" | 58 #include "ppapi/shared_impl/private/ppb_host_resolver_shared.h" |
| 57 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" | 59 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" |
| 58 #include "ppapi/shared_impl/url_request_info_data.h" | 60 #include "ppapi/shared_impl/url_request_info_data.h" |
| 59 #include "ppapi/shared_impl/url_response_info_data.h" | 61 #include "ppapi/shared_impl/url_response_info_data.h" |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 149 IPC_STRUCT_TRAITS_MEMBER(scheme) | 151 IPC_STRUCT_TRAITS_MEMBER(scheme) |
| 150 IPC_STRUCT_TRAITS_MEMBER(username) | 152 IPC_STRUCT_TRAITS_MEMBER(username) |
| 151 IPC_STRUCT_TRAITS_MEMBER(password) | 153 IPC_STRUCT_TRAITS_MEMBER(password) |
| 152 IPC_STRUCT_TRAITS_MEMBER(host) | 154 IPC_STRUCT_TRAITS_MEMBER(host) |
| 153 IPC_STRUCT_TRAITS_MEMBER(port) | 155 IPC_STRUCT_TRAITS_MEMBER(port) |
| 154 IPC_STRUCT_TRAITS_MEMBER(path) | 156 IPC_STRUCT_TRAITS_MEMBER(path) |
| 155 IPC_STRUCT_TRAITS_MEMBER(query) | 157 IPC_STRUCT_TRAITS_MEMBER(query) |
| 156 IPC_STRUCT_TRAITS_MEMBER(ref) | 158 IPC_STRUCT_TRAITS_MEMBER(ref) |
| 157 IPC_STRUCT_TRAITS_END() | 159 IPC_STRUCT_TRAITS_END() |
| 158 | 160 |
| 161 IPC_STRUCT_TRAITS_BEGIN(ppapi::DirEntry) | |
|
yzshen1
2012/11/21 00:38:59
nit: move it the below ppapi::DeviceRefData.
raymes
2012/11/21 22:44:53
Done.
| |
| 162 IPC_STRUCT_TRAITS_MEMBER(name) | |
| 163 IPC_STRUCT_TRAITS_MEMBER(is_dir) | |
| 164 IPC_STRUCT_TRAITS_END() | |
| 165 | |
| 159 IPC_STRUCT_TRAITS_BEGIN(ppapi::DeviceRefData) | 166 IPC_STRUCT_TRAITS_BEGIN(ppapi::DeviceRefData) |
| 160 IPC_STRUCT_TRAITS_MEMBER(type) | 167 IPC_STRUCT_TRAITS_MEMBER(type) |
| 161 IPC_STRUCT_TRAITS_MEMBER(name) | 168 IPC_STRUCT_TRAITS_MEMBER(name) |
| 162 IPC_STRUCT_TRAITS_MEMBER(id) | 169 IPC_STRUCT_TRAITS_MEMBER(id) |
| 163 IPC_STRUCT_TRAITS_END() | 170 IPC_STRUCT_TRAITS_END() |
| 164 | 171 |
| 165 IPC_STRUCT_TRAITS_BEGIN(ppapi::FlashSiteSetting) | 172 IPC_STRUCT_TRAITS_BEGIN(ppapi::FlashSiteSetting) |
| 166 IPC_STRUCT_TRAITS_MEMBER(site) | 173 IPC_STRUCT_TRAITS_MEMBER(site) |
| 167 IPC_STRUCT_TRAITS_MEMBER(permission) | 174 IPC_STRUCT_TRAITS_MEMBER(permission) |
| 168 IPC_STRUCT_TRAITS_END() | 175 IPC_STRUCT_TRAITS_END() |
| (...skipping 1164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1333 PP_Bool /* fullscreen */, | 1340 PP_Bool /* fullscreen */, |
| 1334 PP_Bool /* result */) | 1341 PP_Bool /* result */) |
| 1335 IPC_SYNC_MESSAGE_ROUTED1_2(PpapiHostMsg_PPBFlash_FlashGetScreenSize, | 1342 IPC_SYNC_MESSAGE_ROUTED1_2(PpapiHostMsg_PPBFlash_FlashGetScreenSize, |
| 1336 PP_Instance /* instance */, | 1343 PP_Instance /* instance */, |
| 1337 PP_Bool /* result */, | 1344 PP_Bool /* result */, |
| 1338 PP_Size /* size */) | 1345 PP_Size /* size */) |
| 1339 IPC_MESSAGE_ROUTED0(PpapiHostMsg_PPBFlash_UpdateActivity) | 1346 IPC_MESSAGE_ROUTED0(PpapiHostMsg_PPBFlash_UpdateActivity) |
| 1340 IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBFlash_GetDeviceID, | 1347 IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBFlash_GetDeviceID, |
| 1341 PP_Instance /* instance */, | 1348 PP_Instance /* instance */, |
| 1342 ppapi::proxy::SerializedVar /* id */) | 1349 ppapi::proxy::SerializedVar /* id */) |
| 1343 IPC_SYNC_MESSAGE_ROUTED3_2(PpapiHostMsg_PPBFlash_OpenFileRef, | |
| 1344 PP_Instance /* instance */, | |
| 1345 ppapi::HostResource /* file_ref */, | |
| 1346 int32_t /* mode */, | |
| 1347 IPC::PlatformFileForTransit /* file_handle */, | |
| 1348 int32_t /* result */) | |
| 1349 IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBFlash_QueryFileRef, | |
| 1350 PP_Instance /* instance */, | |
| 1351 ppapi::HostResource /* file_ref */, | |
| 1352 PP_FileInfo /* info */, | |
| 1353 int32_t /* result */) | |
| 1354 IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBFlash_GetSetting, | 1350 IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBFlash_GetSetting, |
| 1355 PP_Instance /* instance */, | 1351 PP_Instance /* instance */, |
| 1356 PP_FlashSetting /* setting */, | 1352 PP_FlashSetting /* setting */, |
| 1357 ppapi::proxy::SerializedVar /* result */) | 1353 ppapi::proxy::SerializedVar /* result */) |
| 1358 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBFlash_InvokePrinting, | 1354 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBFlash_InvokePrinting, |
| 1359 PP_Instance /* instance */) | 1355 PP_Instance /* instance */) |
| 1360 | 1356 |
| 1361 // PPB_Flash_DeviceID. | 1357 // PPB_Flash_DeviceID. |
| 1362 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBFlashDeviceID_Get, | 1358 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBFlashDeviceID_Get, |
| 1363 int32 /* routing_id */, | 1359 int32 /* routing_id */, |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1640 IPC_MESSAGE_CONTROL2(PpapiHostMsg_FlashClipboard_ReadData, | 1636 IPC_MESSAGE_CONTROL2(PpapiHostMsg_FlashClipboard_ReadData, |
| 1641 uint32_t /* clipboard_type */, | 1637 uint32_t /* clipboard_type */, |
| 1642 uint32_t /* format */) | 1638 uint32_t /* format */) |
| 1643 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashClipboard_ReadDataReply, | 1639 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashClipboard_ReadDataReply, |
| 1644 std::string /* result */) | 1640 std::string /* result */) |
| 1645 IPC_MESSAGE_CONTROL3(PpapiHostMsg_FlashClipboard_WriteData, | 1641 IPC_MESSAGE_CONTROL3(PpapiHostMsg_FlashClipboard_WriteData, |
| 1646 uint32_t /* clipboard_type */, | 1642 uint32_t /* clipboard_type */, |
| 1647 std::vector<uint32_t> /* formats */, | 1643 std::vector<uint32_t> /* formats */, |
| 1648 std::vector<std::string> /* data */) | 1644 std::vector<std::string> /* data */) |
| 1649 | 1645 |
| 1646 // Flash file. | |
| 1647 IPC_MESSAGE_CONTROL0(PpapiHostMsg_FlashFile_Create) | |
| 1648 IPC_MESSAGE_CONTROL2(PpapiHostMsg_FlashFile_OpenFile, | |
| 1649 ppapi::PepperFilePath /* path */, | |
| 1650 int /* flags */) | |
| 1651 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashFile_OpenFileReply, | |
|
yzshen1
2012/11/21 00:38:59
This one is not needed.
raymes
2012/11/21 22:44:53
good catch. Done.
| |
| 1652 IPC::PlatformFileForTransit /* transit_file */) | |
| 1653 IPC_MESSAGE_CONTROL2(PpapiHostMsg_FlashFile_RenameFile, | |
| 1654 ppapi::PepperFilePath /* from_path */, | |
| 1655 ppapi::PepperFilePath /* to_path */) | |
| 1656 IPC_MESSAGE_CONTROL2(PpapiHostMsg_FlashFile_DeleteFileOrDir, | |
| 1657 ppapi::PepperFilePath /* path */, | |
| 1658 bool /* recursive */) | |
| 1659 IPC_MESSAGE_CONTROL1(PpapiHostMsg_FlashFile_CreateDir, | |
| 1660 ppapi::PepperFilePath /* path */) | |
| 1661 IPC_MESSAGE_CONTROL1(PpapiHostMsg_FlashFile_QueryFile, | |
| 1662 ppapi::PepperFilePath /* path */) | |
| 1663 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashFile_QueryFileReply, | |
| 1664 base::PlatformFileInfo /* file_info */) | |
| 1665 IPC_MESSAGE_CONTROL1(PpapiHostMsg_FlashFile_GetDirContents, | |
| 1666 ppapi::PepperFilePath /* path */) | |
| 1667 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashFile_GetDirContentsReply, | |
| 1668 ppapi::DirContents /* entries */) | |
| 1669 IPC_MESSAGE_CONTROL0(PpapiHostMsg_FlashFile_CreateTemporaryFile) | |
| 1670 | |
| 1650 // Flash font file. | 1671 // Flash font file. |
| 1651 IPC_MESSAGE_CONTROL2(PpapiHostMsg_FlashFontFile_Create, | 1672 IPC_MESSAGE_CONTROL2(PpapiHostMsg_FlashFontFile_Create, |
| 1652 ppapi::proxy::SerializedFontDescription /* description */, | 1673 ppapi::proxy::SerializedFontDescription /* description */, |
| 1653 PP_PrivateFontCharset /* charset */) | 1674 PP_PrivateFontCharset /* charset */) |
| 1654 IPC_MESSAGE_CONTROL1(PpapiHostMsg_FlashFontFile_GetFontTable, | 1675 IPC_MESSAGE_CONTROL1(PpapiHostMsg_FlashFontFile_GetFontTable, |
| 1655 uint32_t /* table */) | 1676 uint32_t /* table */) |
| 1656 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashFontFile_GetFontTableReply, | 1677 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashFontFile_GetFontTableReply, |
| 1657 std::string /* output */) | 1678 std::string /* output */) |
| 1658 | 1679 |
| 1659 // FlashMenu ------------------------------------------------------------------ | 1680 // FlashMenu ------------------------------------------------------------------ |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1698 std::vector<ppapi::HostResource> /* buffers */, | 1719 std::vector<ppapi::HostResource> /* buffers */, |
| 1699 uint32_t /* buffer_size */) | 1720 uint32_t /* buffer_size */) |
| 1700 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnStatus, | 1721 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnStatus, |
| 1701 uint32_t /* status */) | 1722 uint32_t /* status */) |
| 1702 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError, | 1723 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError, |
| 1703 uint32_t /* error */) | 1724 uint32_t /* error */) |
| 1704 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady, | 1725 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady, |
| 1705 uint32_t /* buffer */) | 1726 uint32_t /* buffer */) |
| 1706 | 1727 |
| 1707 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 1728 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| OLD | NEW |