| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 file, no traditional include guard | 5 // Multiply-included message file, no traditional include guard |
| 6 #include "chrome/common/common_param_traits.h" | |
| 7 #include "ipc/ipc_message_macros.h" | 6 #include "ipc/ipc_message_macros.h" |
| 8 #include "ipc/ipc_param_traits.h" | 7 #include "ipc/ipc_param_traits.h" |
| 9 #include "ipc/ipc_platform_file.h" | 8 #include "ipc/ipc_platform_file.h" |
| 10 #include "ppapi/c/private/ppb_flash_net_connector.h" | 9 #include "ppapi/c/private/ppb_flash_net_connector.h" |
| 11 | 10 |
| 12 // Singly-included section, not yet converted. | 11 // Singly-included section, not yet converted. |
| 13 #ifndef CHROME_COMMON_PEPPER_MESSAGES_H_ | 12 #ifndef CONTENT_COMMON_PEPPER_MESSAGES_H_ |
| 14 #define CHROME_COMMON_PEPPER_MESSAGES_H_ | 13 #define CONTENT_COMMON_PEPPER_MESSAGES_H_ |
| 15 | 14 |
| 16 namespace IPC { | 15 namespace IPC { |
| 17 | 16 |
| 18 template <> | 17 template <> |
| 19 struct ParamTraits<PP_Flash_NetAddress> { | 18 struct ParamTraits<PP_Flash_NetAddress> { |
| 20 typedef PP_Flash_NetAddress param_type; | 19 typedef PP_Flash_NetAddress param_type; |
| 21 static void Write(Message* m, const param_type& p); | 20 static void Write(Message* m, const param_type& p); |
| 22 static bool Read(const Message* m, void** iter, param_type* p); | 21 static bool Read(const Message* m, void** iter, param_type* p); |
| 23 static void Log(const param_type& p, std::string* l); | 22 static void Log(const param_type& p, std::string* l); |
| 24 }; | 23 }; |
| 25 | 24 |
| 26 } // namespace IPC | 25 } // namespace IPC |
| 27 | 26 |
| 27 #endif // CONTENT_COMMON_PEPPER_MESSAGES_H_ |
| 28 |
| 28 #define IPC_MESSAGE_START PepperMsgStart | 29 #define IPC_MESSAGE_START PepperMsgStart |
| 29 | 30 |
| 30 #endif // CHROME_COMMON_PEPPER_MESSAGES_H_ | |
| 31 | |
| 32 // Pepper (non-file-system) messages sent from the browser to the renderer. | 31 // Pepper (non-file-system) messages sent from the browser to the renderer. |
| 33 | 32 |
| 34 // The response to PepperMsg_ConnectTcp(Address). | 33 // The response to PepperMsg_ConnectTcp(Address). |
| 35 IPC_MESSAGE_ROUTED4(PepperMsg_ConnectTcpACK, | 34 IPC_MESSAGE_ROUTED4(PepperMsg_ConnectTcpACK, |
| 36 int /* request_id */, | 35 int /* request_id */, |
| 37 IPC::PlatformFileForTransit /* socket */, | 36 IPC::PlatformFileForTransit /* socket */, |
| 38 PP_Flash_NetAddress /* local_addr */, | 37 PP_Flash_NetAddress /* local_addr */, |
| 39 PP_Flash_NetAddress /* remote_addr */) | 38 PP_Flash_NetAddress /* remote_addr */) |
| 40 | 39 |
| 41 // Pepper (non-file-system) messages sent from the renderer to the browser. | 40 // Pepper (non-file-system) messages sent from the renderer to the browser. |
| 42 | 41 |
| 43 IPC_MESSAGE_CONTROL4(PepperMsg_ConnectTcp, | 42 IPC_MESSAGE_CONTROL4(PepperMsg_ConnectTcp, |
| 44 int /* routing_id */, | 43 int /* routing_id */, |
| 45 int /* request_id */, | 44 int /* request_id */, |
| 46 std::string /* host */, | 45 std::string /* host */, |
| 47 uint16 /* port */) | 46 uint16 /* port */) |
| 48 | 47 |
| 49 IPC_MESSAGE_CONTROL3(PepperMsg_ConnectTcpAddress, | 48 IPC_MESSAGE_CONTROL3(PepperMsg_ConnectTcpAddress, |
| 50 int /* routing_id */, | 49 int /* routing_id */, |
| 51 int /* request_id */, | 50 int /* request_id */, |
| 52 PP_Flash_NetAddress /* addr */) | 51 PP_Flash_NetAddress /* addr */) |
| 53 | 52 |
| OLD | NEW |