| 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 #ifndef COMPONENTS_NACL_COMMON_NACL_TYPES_H_ | 5 #ifndef COMPONENTS_NACL_COMMON_NACL_TYPES_H_ |
| 6 #define COMPONENTS_NACL_COMMON_NACL_TYPES_H_ | 6 #define COMPONENTS_NACL_COMMON_NACL_TYPES_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 uint32 permission_bits; | 81 uint32 permission_bits; |
| 82 bool uses_irt; | 82 bool uses_irt; |
| 83 bool enable_dyncode_syscalls; | 83 bool enable_dyncode_syscalls; |
| 84 bool enable_exception_handling; | 84 bool enable_exception_handling; |
| 85 bool enable_crash_throttling; | 85 bool enable_crash_throttling; |
| 86 }; | 86 }; |
| 87 | 87 |
| 88 struct NaClLaunchResult { | 88 struct NaClLaunchResult { |
| 89 NaClLaunchResult(); | 89 NaClLaunchResult(); |
| 90 NaClLaunchResult(FileDescriptor imc_channel_handle, | 90 NaClLaunchResult(FileDescriptor imc_channel_handle, |
| 91 const IPC::ChannelHandle& ipc_channel_handle, | 91 const IPC::ChannelHandle& untrusted_ipc_channel_handle, |
| 92 const IPC::ChannelHandle& trusted_ipc_channel_handle, |
| 92 base::ProcessId plugin_pid, | 93 base::ProcessId plugin_pid, |
| 93 int plugin_child_id); | 94 int plugin_child_id); |
| 94 ~NaClLaunchResult(); | 95 ~NaClLaunchResult(); |
| 95 | 96 |
| 96 FileDescriptor imc_channel_handle; | 97 FileDescriptor imc_channel_handle; |
| 97 IPC::ChannelHandle ipc_channel_handle; | 98 IPC::ChannelHandle untrusted_ipc_channel_handle; |
| 99 IPC::ChannelHandle trusted_ipc_channel_handle; |
| 98 base::ProcessId plugin_pid; | 100 base::ProcessId plugin_pid; |
| 99 int plugin_child_id; | 101 int plugin_child_id; |
| 100 }; | 102 }; |
| 101 | 103 |
| 102 } // namespace nacl | 104 } // namespace nacl |
| 103 | 105 |
| 104 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ | 106 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ |
| OLD | NEW |