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 <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 #if defined(OS_LINUX) || defined(OS_NACL_NONSFI) | 82 #if defined(OS_LINUX) || defined(OS_NACL_NONSFI) |
83 // These are for Non-SFI mode IPC channels. | 83 // These are for Non-SFI mode IPC channels. |
84 // For security hardening, unlike in SFI mode, we cannot create socket pairs | 84 // For security hardening, unlike in SFI mode, we cannot create socket pairs |
85 // in a NaCl loader process. Thus, the browser process creates the | 85 // in a NaCl loader process. Thus, the browser process creates the |
86 // ChannelHandle instances, and passes them to the NaCl loader process. | 86 // ChannelHandle instances, and passes them to the NaCl loader process. |
87 // SFI mode uses NaClProcessHostMsg_PpapiChannelsCreated instead. | 87 // SFI mode uses NaClProcessHostMsg_PpapiChannelsCreated instead. |
88 IPC::ChannelHandle ppapi_browser_channel_handle; | 88 IPC::ChannelHandle ppapi_browser_channel_handle; |
89 IPC::ChannelHandle ppapi_renderer_channel_handle; | 89 IPC::ChannelHandle ppapi_renderer_channel_handle; |
90 IPC::ChannelHandle trusted_service_channel_handle; | 90 IPC::ChannelHandle trusted_service_channel_handle; |
91 IPC::ChannelHandle manifest_service_channel_handle; | 91 IPC::ChannelHandle manifest_service_channel_handle; |
| 92 IPC::ChannelHandle ppapi_browser_mojo_handle; |
92 #endif | 93 #endif |
93 | 94 |
94 bool validation_cache_enabled; | 95 bool validation_cache_enabled; |
95 std::string validation_cache_key; | 96 std::string validation_cache_key; |
96 // Chrome version string. Sending the version string over IPC avoids linkage | 97 // Chrome version string. Sending the version string over IPC avoids linkage |
97 // 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 |
98 // executable or DLL. | 99 // executable or DLL. |
99 std::string version; | 100 std::string version; |
100 | 101 |
101 bool enable_debug_stub; | 102 bool enable_debug_stub; |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 base::ProcessId plugin_pid; | 170 base::ProcessId plugin_pid; |
170 int plugin_child_id; | 171 int plugin_child_id; |
171 | 172 |
172 // For NaCl <-> renderer crash information reporting. | 173 // For NaCl <-> renderer crash information reporting. |
173 base::SharedMemoryHandle crash_info_shmem_handle; | 174 base::SharedMemoryHandle crash_info_shmem_handle; |
174 }; | 175 }; |
175 | 176 |
176 } // namespace nacl | 177 } // namespace nacl |
177 | 178 |
178 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ | 179 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ |
OLD | NEW |