Chromium Code Reviews| 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 <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 74 | 74 |
| 75 IPC::PlatformFileForTransit imc_bootstrap_handle; | 75 IPC::PlatformFileForTransit imc_bootstrap_handle; |
| 76 IPC::PlatformFileForTransit irt_handle; | 76 IPC::PlatformFileForTransit irt_handle; |
| 77 #if defined(OS_MACOSX) | 77 #if defined(OS_MACOSX) |
| 78 IPC::PlatformFileForTransit mac_shm_fd; | 78 IPC::PlatformFileForTransit mac_shm_fd; |
| 79 #endif | 79 #endif |
| 80 #if defined(OS_POSIX) | 80 #if defined(OS_POSIX) |
| 81 IPC::PlatformFileForTransit debug_stub_server_bound_socket; | 81 IPC::PlatformFileForTransit debug_stub_server_bound_socket; |
| 82 #endif | 82 #endif |
| 83 | 83 |
| 84 #if defined(OS_LINUX) || defined(OS_NACL_NONSFI) | |
| 85 // These are for Non-SFI mode IPC channels. | |
| 86 // For security hardening, unlike in SFI mode, we cannot create socket pairs | |
| 87 // in plugin process. Thus, the browser process creates the ChannelHandle | |
|
Mark Seaborn
2015/05/12 23:24:06
Nit: "plugin process" -> "NaCl loader process" aga
hidehiko
2015/05/13 06:39:21
Done.
| |
| 88 // instances, and passes them to the plugin process. | |
| 89 IPC::ChannelHandle ppapi_browser_channel_handle; | |
| 90 IPC::ChannelHandle ppapi_renderer_channel_handle; | |
| 91 IPC::ChannelHandle trusted_service_channel_handle; | |
| 92 IPC::ChannelHandle manifest_service_channel_handle; | |
| 93 #endif | |
| 94 | |
| 84 bool validation_cache_enabled; | 95 bool validation_cache_enabled; |
| 85 std::string validation_cache_key; | 96 std::string validation_cache_key; |
| 86 // Chrome version string. Sending the version string over IPC avoids linkage | 97 // Chrome version string. Sending the version string over IPC avoids linkage |
| 87 // issues in cases where NaCl is not compiled into the main Chromium | 98 // issues in cases where NaCl is not compiled into the main Chromium |
| 88 // executable or DLL. | 99 // executable or DLL. |
| 89 std::string version; | 100 std::string version; |
| 90 | 101 |
| 91 bool enable_debug_stub; | 102 bool enable_debug_stub; |
| 92 bool enable_ipc_proxy; | 103 bool enable_ipc_proxy; |
| 93 | 104 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 164 base::ProcessId plugin_pid; | 175 base::ProcessId plugin_pid; |
| 165 int plugin_child_id; | 176 int plugin_child_id; |
| 166 | 177 |
| 167 // For NaCl <-> renderer crash information reporting. | 178 // For NaCl <-> renderer crash information reporting. |
| 168 base::SharedMemoryHandle crash_info_shmem_handle; | 179 base::SharedMemoryHandle crash_info_shmem_handle; |
| 169 }; | 180 }; |
| 170 | 181 |
| 171 } // namespace nacl | 182 } // namespace nacl |
| 172 | 183 |
| 173 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ | 184 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ |
| OLD | NEW |