| 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 uses_nonsfi_mode; | |
| 64 }; | 63 }; |
| 65 | 64 |
| 66 // Parameters sent to the browser process to have it launch a NaCl process. | 65 // Parameters sent to the browser process to have it launch a NaCl process. |
| 67 // | 66 // |
| 68 // If you change this, you will also need to update the IPC serialization in | 67 // If you change this, you will also need to update the IPC serialization in |
| 69 // nacl_host_messages.h. | 68 // nacl_host_messages.h. |
| 70 struct NaClLaunchParams { | 69 struct NaClLaunchParams { |
| 71 NaClLaunchParams(); | 70 NaClLaunchParams(); |
| 72 NaClLaunchParams(const std::string& u, int r, uint32 p, | 71 NaClLaunchParams(const std::string& u, int r, uint32 p, |
| 73 bool uses_irt, | 72 bool uses_irt, |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 // For plugin loader <-> renderer control communication (loading and | 105 // For plugin loader <-> renderer control communication (loading and |
| 107 // starting nexe). | 106 // starting nexe). |
| 108 IPC::ChannelHandle trusted_ipc_channel_handle; | 107 IPC::ChannelHandle trusted_ipc_channel_handle; |
| 109 base::ProcessId plugin_pid; | 108 base::ProcessId plugin_pid; |
| 110 int plugin_child_id; | 109 int plugin_child_id; |
| 111 }; | 110 }; |
| 112 | 111 |
| 113 } // namespace nacl | 112 } // namespace nacl |
| 114 | 113 |
| 115 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ | 114 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ |
| OLD | NEW |