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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
53 // Chrome version string. Sending the version string over IPC avoids linkage | 53 // Chrome version string. Sending the version string over IPC avoids linkage |
54 // issues in cases where NaCl is not compiled into the main Chromium | 54 // issues in cases where NaCl is not compiled into the main Chromium |
55 // executable or DLL. | 55 // executable or DLL. |
56 std::string version; | 56 std::string version; |
57 | 57 |
58 bool enable_exception_handling; | 58 bool enable_exception_handling; |
59 bool enable_debug_stub; | 59 bool enable_debug_stub; |
60 bool enable_ipc_proxy; | 60 bool enable_ipc_proxy; |
61 bool uses_irt; | 61 bool uses_irt; |
62 bool enable_dyncode_syscalls; | 62 bool enable_dyncode_syscalls; |
63 bool enable_nonsfi_mode; | |
Mark Seaborn
2013/12/10 19:56:44
This doesn't work by itself. For the field to be
hidehiko
2013/12/11 07:56:14
Ah, I should test it more carefully. It looked wor
| |
63 }; | 64 }; |
64 | 65 |
65 // Parameters sent to the browser process to have it launch a NaCl process. | 66 // Parameters sent to the browser process to have it launch a NaCl process. |
66 // | 67 // |
67 // If you change this, you will also need to update the IPC serialization in | 68 // If you change this, you will also need to update the IPC serialization in |
68 // nacl_host_messages.h. | 69 // nacl_host_messages.h. |
69 struct NaClLaunchParams { | 70 struct NaClLaunchParams { |
70 NaClLaunchParams(); | 71 NaClLaunchParams(); |
71 NaClLaunchParams(const std::string& u, int r, uint32 p, bool uses_irt, | 72 NaClLaunchParams(const std::string& u, int r, uint32 p, bool uses_irt, |
72 bool enable_dyncode_syscalls, | 73 bool enable_dyncode_syscalls, |
(...skipping 21 matching lines...) Expand all Loading... | |
94 | 95 |
95 FileDescriptor imc_channel_handle; | 96 FileDescriptor imc_channel_handle; |
96 IPC::ChannelHandle ipc_channel_handle; | 97 IPC::ChannelHandle ipc_channel_handle; |
97 base::ProcessId plugin_pid; | 98 base::ProcessId plugin_pid; |
98 int plugin_child_id; | 99 int plugin_child_id; |
99 }; | 100 }; |
100 | 101 |
101 } // namespace nacl | 102 } // namespace nacl |
102 | 103 |
103 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ | 104 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ |
OLD | NEW |