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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 // serialization in nacl_messages.h and (for POD fields) the constructor | 61 // serialization in nacl_messages.h and (for POD fields) the constructor |
62 // in nacl_types.cc. | 62 // in nacl_types.cc. |
63 }; | 63 }; |
64 | 64 |
65 // 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. |
66 // | 66 // |
67 // 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 |
68 // nacl_host_messages.h. | 68 // nacl_host_messages.h. |
69 struct NaClLaunchParams { | 69 struct NaClLaunchParams { |
70 NaClLaunchParams(); | 70 NaClLaunchParams(); |
71 NaClLaunchParams(const std::string& u, int r, uint32 p, | 71 NaClLaunchParams(const std::string& document_url, |
| 72 const std::string& manifest_url, |
| 73 int render_view_id, |
| 74 uint32 p, |
72 bool uses_irt, | 75 bool uses_irt, |
73 bool uses_nonsfi_mode, | 76 bool uses_nonsfi_mode, |
74 bool enable_dyncode_syscalls, | 77 bool enable_dyncode_syscalls, |
75 bool enable_exception_handling, | 78 bool enable_exception_handling, |
76 bool enable_crash_throttling); | 79 bool enable_crash_throttling); |
77 NaClLaunchParams(const NaClLaunchParams& l); | 80 NaClLaunchParams(const NaClLaunchParams& l); |
78 ~NaClLaunchParams(); | 81 ~NaClLaunchParams(); |
79 | 82 |
| 83 std::string document_url; |
80 std::string manifest_url; | 84 std::string manifest_url; |
81 int render_view_id; | 85 int render_view_id; |
82 uint32 permission_bits; | 86 uint32 permission_bits; |
83 bool uses_irt; | 87 bool uses_irt; |
84 bool uses_nonsfi_mode; | 88 bool uses_nonsfi_mode; |
85 bool enable_dyncode_syscalls; | 89 bool enable_dyncode_syscalls; |
86 bool enable_exception_handling; | 90 bool enable_exception_handling; |
87 bool enable_crash_throttling; | 91 bool enable_crash_throttling; |
88 }; | 92 }; |
89 | 93 |
(...skipping 21 matching lines...) Expand all Loading... |
111 // For plugin <-> renderer ManifestService communication. | 115 // For plugin <-> renderer ManifestService communication. |
112 IPC::ChannelHandle manifest_service_ipc_channel_handle; | 116 IPC::ChannelHandle manifest_service_ipc_channel_handle; |
113 | 117 |
114 base::ProcessId plugin_pid; | 118 base::ProcessId plugin_pid; |
115 int plugin_child_id; | 119 int plugin_child_id; |
116 }; | 120 }; |
117 | 121 |
118 } // namespace nacl | 122 } // namespace nacl |
119 | 123 |
120 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ | 124 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ |
OLD | NEW |