| 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 10 matching lines...) Expand all Loading... |
| 21 | 21 |
| 22 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchParams) | 22 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchParams) |
| 23 IPC_STRUCT_TRAITS_MEMBER(manifest_url) | 23 IPC_STRUCT_TRAITS_MEMBER(manifest_url) |
| 24 IPC_STRUCT_TRAITS_MEMBER(render_view_id) | 24 IPC_STRUCT_TRAITS_MEMBER(render_view_id) |
| 25 IPC_STRUCT_TRAITS_MEMBER(permission_bits) | 25 IPC_STRUCT_TRAITS_MEMBER(permission_bits) |
| 26 IPC_STRUCT_TRAITS_MEMBER(uses_irt) | 26 IPC_STRUCT_TRAITS_MEMBER(uses_irt) |
| 27 IPC_STRUCT_TRAITS_MEMBER(enable_dyncode_syscalls) | 27 IPC_STRUCT_TRAITS_MEMBER(enable_dyncode_syscalls) |
| 28 IPC_STRUCT_TRAITS_MEMBER(enable_exception_handling) | 28 IPC_STRUCT_TRAITS_MEMBER(enable_exception_handling) |
| 29 IPC_STRUCT_TRAITS_END() | 29 IPC_STRUCT_TRAITS_END() |
| 30 | 30 |
| 31 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchResult) |
| 32 IPC_STRUCT_TRAITS_MEMBER(imc_channel_handle) |
| 33 IPC_STRUCT_TRAITS_MEMBER(ipc_channel_handle) |
| 34 IPC_STRUCT_TRAITS_MEMBER(plugin_pid) |
| 35 IPC_STRUCT_TRAITS_MEMBER(plugin_child_id) |
| 36 IPC_STRUCT_TRAITS_END() |
| 37 |
| 31 // A renderer sends this to the browser process when it wants to start | 38 // A renderer sends this to the browser process when it wants to start |
| 32 // a new instance of the Native Client process. The browser will launch | 39 // a new instance of the Native Client process. The browser will launch |
| 33 // the process and return an IPC channel handle. This handle will only | 40 // the process and return an IPC channel handle. This handle will only |
| 34 // be valid if the NaCl IPC proxy is enabled. | 41 // be valid if the NaCl IPC proxy is enabled. |
| 35 IPC_SYNC_MESSAGE_CONTROL1_4(NaClHostMsg_LaunchNaCl, | 42 IPC_SYNC_MESSAGE_CONTROL1_2(NaClHostMsg_LaunchNaCl, |
| 36 nacl::NaClLaunchParams /* launch_params */, | 43 nacl::NaClLaunchParams /* launch_params */, |
| 37 nacl::FileDescriptor /* imc channel handle */, | 44 nacl::NaClLaunchResult /* launch_result */, |
| 38 IPC::ChannelHandle /* ipc_channel_handle */, | 45 std::string /* error_message */) |
| 39 base::ProcessId /* plugin_pid */, | |
| 40 int /* plugin_child_id */) | |
| 41 | 46 |
| 42 // A renderer sends this to the browser process when it wants to | 47 // A renderer sends this to the browser process when it wants to |
| 43 // open a file for from the Pnacl component directory. | 48 // open a file for from the Pnacl component directory. |
| 44 IPC_SYNC_MESSAGE_CONTROL1_1(NaClHostMsg_GetReadonlyPnaclFD, | 49 IPC_SYNC_MESSAGE_CONTROL1_1(NaClHostMsg_GetReadonlyPnaclFD, |
| 45 std::string /* name of requested PNaCl file */, | 50 std::string /* name of requested PNaCl file */, |
| 46 IPC::PlatformFileForTransit /* output file */) | 51 IPC::PlatformFileForTransit /* output file */) |
| 47 | 52 |
| 48 // A renderer sends this to the browser process when it wants to | 53 // A renderer sends this to the browser process when it wants to |
| 49 // create a temporary file. | 54 // create a temporary file. |
| 50 IPC_SYNC_MESSAGE_CONTROL0_1(NaClHostMsg_NaClCreateTemporaryFile, | 55 IPC_SYNC_MESSAGE_CONTROL0_1(NaClHostMsg_NaClCreateTemporaryFile, |
| 51 IPC::PlatformFileForTransit /* out file */) | 56 IPC::PlatformFileForTransit /* out file */) |
| 52 | 57 |
| 53 // A renderer sends this to the browser process to display infobar | 58 // A renderer sends this to the browser process to display infobar |
| 54 IPC_MESSAGE_CONTROL2(NaClHostMsg_NaClErrorStatus, | 59 IPC_MESSAGE_CONTROL2(NaClHostMsg_NaClErrorStatus, |
| 55 int /* render_view_id */, | 60 int /* render_view_id */, |
| 56 int /* Error ID */) | 61 int /* Error ID */) |
| 57 | 62 |
| 58 // A renderer sends this to the browser process when it wants to | 63 // A renderer sends this to the browser process when it wants to |
| 59 // open a NaCl executable file from an installed application directory. | 64 // open a NaCl executable file from an installed application directory. |
| 60 IPC_SYNC_MESSAGE_CONTROL2_3(NaClHostMsg_OpenNaClExecutable, | 65 IPC_SYNC_MESSAGE_CONTROL2_3(NaClHostMsg_OpenNaClExecutable, |
| 61 int /* render_view_id */, | 66 int /* render_view_id */, |
| 62 GURL /* URL of NaCl executable file */, | 67 GURL /* URL of NaCl executable file */, |
| 63 IPC::PlatformFileForTransit /* output file */, | 68 IPC::PlatformFileForTransit /* output file */, |
| 64 uint64 /* file_token_lo */, | 69 uint64 /* file_token_lo */, |
| 65 uint64 /* file_token_hi */) | 70 uint64 /* file_token_hi */) |
| OLD | NEW |