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/process.h" | 10 #include "base/process/process.h" |
(...skipping 13 matching lines...) Expand all Loading... |
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_MEMBER(enable_crash_throttling) | 29 IPC_STRUCT_TRAITS_MEMBER(enable_crash_throttling) |
30 IPC_STRUCT_TRAITS_END() | 30 IPC_STRUCT_TRAITS_END() |
31 | 31 |
32 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchResult) | 32 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchResult) |
33 IPC_STRUCT_TRAITS_MEMBER(imc_channel_handle) | 33 IPC_STRUCT_TRAITS_MEMBER(imc_channel_handle) |
34 IPC_STRUCT_TRAITS_MEMBER(ipc_channel_handle) | 34 IPC_STRUCT_TRAITS_MEMBER(untrusted_ipc_channel_handle) |
| 35 IPC_STRUCT_TRAITS_MEMBER(trusted_ipc_channel_handle) |
35 IPC_STRUCT_TRAITS_MEMBER(plugin_pid) | 36 IPC_STRUCT_TRAITS_MEMBER(plugin_pid) |
36 IPC_STRUCT_TRAITS_MEMBER(plugin_child_id) | 37 IPC_STRUCT_TRAITS_MEMBER(plugin_child_id) |
37 IPC_STRUCT_TRAITS_END() | 38 IPC_STRUCT_TRAITS_END() |
38 | 39 |
39 IPC_STRUCT_TRAITS_BEGIN(nacl::PnaclCacheInfo) | 40 IPC_STRUCT_TRAITS_BEGIN(nacl::PnaclCacheInfo) |
40 IPC_STRUCT_TRAITS_MEMBER(pexe_url) | 41 IPC_STRUCT_TRAITS_MEMBER(pexe_url) |
41 IPC_STRUCT_TRAITS_MEMBER(abi_version) | 42 IPC_STRUCT_TRAITS_MEMBER(abi_version) |
42 IPC_STRUCT_TRAITS_MEMBER(opt_level) | 43 IPC_STRUCT_TRAITS_MEMBER(opt_level) |
43 IPC_STRUCT_TRAITS_MEMBER(last_modified) | 44 IPC_STRUCT_TRAITS_MEMBER(last_modified) |
44 IPC_STRUCT_TRAITS_MEMBER(etag) | 45 IPC_STRUCT_TRAITS_MEMBER(etag) |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 int /* Error ID */) | 93 int /* Error ID */) |
93 | 94 |
94 // A renderer sends this to the browser process when it wants to | 95 // A renderer sends this to the browser process when it wants to |
95 // open a NaCl executable file from an installed application directory. | 96 // open a NaCl executable file from an installed application directory. |
96 IPC_SYNC_MESSAGE_CONTROL2_3(NaClHostMsg_OpenNaClExecutable, | 97 IPC_SYNC_MESSAGE_CONTROL2_3(NaClHostMsg_OpenNaClExecutable, |
97 int /* render_view_id */, | 98 int /* render_view_id */, |
98 GURL /* URL of NaCl executable file */, | 99 GURL /* URL of NaCl executable file */, |
99 IPC::PlatformFileForTransit /* output file */, | 100 IPC::PlatformFileForTransit /* output file */, |
100 uint64 /* file_token_lo */, | 101 uint64 /* file_token_lo */, |
101 uint64 /* file_token_hi */) | 102 uint64 /* file_token_hi */) |
| 103 |
| 104 IPC_SYNC_MESSAGE_CONTROL0_1(NaClHostMsg_CreateTrustedPluginChannel, |
| 105 IPC::ChannelHandle /* channel_handle */) |
OLD | NEW |