| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 file, no traditional include guard. | 5 // Multiply-included file, no traditional include guard. |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/process.h" | 10 #include "base/process.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 | 22 |
| 23 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchParams) | 23 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchParams) |
| 24 IPC_STRUCT_TRAITS_MEMBER(manifest_url) | 24 IPC_STRUCT_TRAITS_MEMBER(manifest_url) |
| 25 IPC_STRUCT_TRAITS_MEMBER(render_view_id) | 25 IPC_STRUCT_TRAITS_MEMBER(render_view_id) |
| 26 IPC_STRUCT_TRAITS_MEMBER(permission_bits) | 26 IPC_STRUCT_TRAITS_MEMBER(permission_bits) |
| 27 IPC_STRUCT_TRAITS_MEMBER(uses_irt) | 27 IPC_STRUCT_TRAITS_MEMBER(uses_irt) |
| 28 IPC_STRUCT_TRAITS_MEMBER(enable_dyncode_syscalls) | 28 IPC_STRUCT_TRAITS_MEMBER(enable_dyncode_syscalls) |
| 29 IPC_STRUCT_TRAITS_MEMBER(enable_exception_handling) | 29 IPC_STRUCT_TRAITS_MEMBER(enable_exception_handling) |
| 30 IPC_STRUCT_TRAITS_END() | 30 IPC_STRUCT_TRAITS_END() |
| 31 | 31 |
| 32 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchResult) |
| 33 IPC_STRUCT_TRAITS_MEMBER(imc_channel_handle) |
| 34 IPC_STRUCT_TRAITS_MEMBER(ipc_channel_handle) |
| 35 IPC_STRUCT_TRAITS_MEMBER(plugin_pid) |
| 36 IPC_STRUCT_TRAITS_MEMBER(plugin_child_id) |
| 37 IPC_STRUCT_TRAITS_END() |
| 38 |
| 32 IPC_STRUCT_TRAITS_BEGIN(nacl::PnaclCacheInfo) | 39 IPC_STRUCT_TRAITS_BEGIN(nacl::PnaclCacheInfo) |
| 33 IPC_STRUCT_TRAITS_MEMBER(pexe_url) | 40 IPC_STRUCT_TRAITS_MEMBER(pexe_url) |
| 34 IPC_STRUCT_TRAITS_MEMBER(abi_version) | 41 IPC_STRUCT_TRAITS_MEMBER(abi_version) |
| 35 IPC_STRUCT_TRAITS_MEMBER(opt_level) | 42 IPC_STRUCT_TRAITS_MEMBER(opt_level) |
| 36 IPC_STRUCT_TRAITS_MEMBER(last_modified) | 43 IPC_STRUCT_TRAITS_MEMBER(last_modified) |
| 37 IPC_STRUCT_TRAITS_MEMBER(etag) | 44 IPC_STRUCT_TRAITS_MEMBER(etag) |
| 38 IPC_STRUCT_TRAITS_END() | 45 IPC_STRUCT_TRAITS_END() |
| 39 | 46 |
| 40 // A renderer sends this to the browser process when it wants to start | 47 // A renderer sends this to the browser process when it wants to start |
| 41 // a new instance of the Native Client process. The browser will launch | 48 // a new instance of the Native Client process. The browser will launch |
| 42 // the process and return an IPC channel handle. This handle will only | 49 // the process and return an IPC channel handle. This handle will only |
| 43 // be valid if the NaCl IPC proxy is enabled. | 50 // be valid if the NaCl IPC proxy is enabled. |
| 44 IPC_SYNC_MESSAGE_CONTROL1_4(NaClHostMsg_LaunchNaCl, | 51 IPC_SYNC_MESSAGE_CONTROL1_2(NaClHostMsg_LaunchNaCl, |
| 45 nacl::NaClLaunchParams /* launch_params */, | 52 nacl::NaClLaunchParams /* launch_params */, |
| 46 nacl::FileDescriptor /* imc channel handle */, | 53 nacl::NaClLaunchResult /* launch_result */, |
| 47 IPC::ChannelHandle /* ipc_channel_handle */, | 54 std::string /* error_message */) |
| 48 base::ProcessId /* plugin_pid */, | |
| 49 int /* plugin_child_id */) | |
| 50 | 55 |
| 51 // A renderer sends this to the browser process when it wants to | 56 // A renderer sends this to the browser process when it wants to |
| 52 // open a file for from the Pnacl component directory. | 57 // open a file for from the Pnacl component directory. |
| 53 IPC_SYNC_MESSAGE_CONTROL1_1(NaClHostMsg_GetReadonlyPnaclFD, | 58 IPC_SYNC_MESSAGE_CONTROL1_1(NaClHostMsg_GetReadonlyPnaclFD, |
| 54 std::string /* name of requested PNaCl file */, | 59 std::string /* name of requested PNaCl file */, |
| 55 IPC::PlatformFileForTransit /* output file */) | 60 IPC::PlatformFileForTransit /* output file */) |
| 56 | 61 |
| 57 // A renderer sends this to the browser process when it wants to | 62 // A renderer sends this to the browser process when it wants to |
| 58 // create a temporary file. | 63 // create a temporary file. |
| 59 IPC_SYNC_MESSAGE_CONTROL0_1(NaClHostMsg_NaClCreateTemporaryFile, | 64 IPC_SYNC_MESSAGE_CONTROL0_1(NaClHostMsg_NaClCreateTemporaryFile, |
| (...skipping 24 matching lines...) Expand all Loading... |
| 84 int /* Error ID */) | 89 int /* Error ID */) |
| 85 | 90 |
| 86 // A renderer sends this to the browser process when it wants to | 91 // A renderer sends this to the browser process when it wants to |
| 87 // open a NaCl executable file from an installed application directory. | 92 // open a NaCl executable file from an installed application directory. |
| 88 IPC_SYNC_MESSAGE_CONTROL2_3(NaClHostMsg_OpenNaClExecutable, | 93 IPC_SYNC_MESSAGE_CONTROL2_3(NaClHostMsg_OpenNaClExecutable, |
| 89 int /* render_view_id */, | 94 int /* render_view_id */, |
| 90 GURL /* URL of NaCl executable file */, | 95 GURL /* URL of NaCl executable file */, |
| 91 IPC::PlatformFileForTransit /* output file */, | 96 IPC::PlatformFileForTransit /* output file */, |
| 92 uint64 /* file_token_lo */, | 97 uint64 /* file_token_lo */, |
| 93 uint64 /* file_token_hi */) | 98 uint64 /* file_token_hi */) |
| OLD | NEW |