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 #include "components/nacl/common/nacl_types.h" | 5 #include "components/nacl/common/nacl_types.h" |
6 #include "ipc/ipc_platform_file.h" | 6 #include "ipc/ipc_platform_file.h" |
7 | 7 |
8 namespace nacl { | 8 namespace nacl { |
9 | 9 |
10 NaClStartParams::NaClStartParams() | 10 NaClStartParams::NaClStartParams() |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 enable_dyncode_syscalls = l.enable_dyncode_syscalls; | 53 enable_dyncode_syscalls = l.enable_dyncode_syscalls; |
54 enable_exception_handling = l.enable_exception_handling; | 54 enable_exception_handling = l.enable_exception_handling; |
55 enable_crash_throttling = l.enable_crash_throttling; | 55 enable_crash_throttling = l.enable_crash_throttling; |
56 } | 56 } |
57 | 57 |
58 NaClLaunchParams::~NaClLaunchParams() { | 58 NaClLaunchParams::~NaClLaunchParams() { |
59 } | 59 } |
60 | 60 |
61 NaClLaunchResult::NaClLaunchResult() | 61 NaClLaunchResult::NaClLaunchResult() |
62 : imc_channel_handle(IPC::InvalidPlatformFileForTransit()), | 62 : imc_channel_handle(IPC::InvalidPlatformFileForTransit()), |
63 ipc_channel_handle(), | 63 untrusted_ipc_channel_handle(), |
| 64 trusted_ipc_channel_handle(), |
64 plugin_pid(base::kNullProcessId), | 65 plugin_pid(base::kNullProcessId), |
65 plugin_child_id(0) { | 66 plugin_child_id(0) { |
66 } | 67 } |
67 | 68 |
68 NaClLaunchResult::NaClLaunchResult( | 69 NaClLaunchResult::NaClLaunchResult( |
69 FileDescriptor imc_channel_handle, | 70 FileDescriptor imc_channel_handle, |
70 const IPC::ChannelHandle& ipc_channel_handle, | 71 const IPC::ChannelHandle& untrusted_ipc_channel_handle, |
| 72 const IPC::ChannelHandle& trusted_ipc_channel_handle, |
71 base::ProcessId plugin_pid, | 73 base::ProcessId plugin_pid, |
72 int plugin_child_id) | 74 int plugin_child_id) |
73 : imc_channel_handle(imc_channel_handle), | 75 : imc_channel_handle(imc_channel_handle), |
74 ipc_channel_handle(ipc_channel_handle), | 76 untrusted_ipc_channel_handle(untrusted_ipc_channel_handle), |
| 77 trusted_ipc_channel_handle(trusted_ipc_channel_handle), |
75 plugin_pid(plugin_pid), | 78 plugin_pid(plugin_pid), |
76 plugin_child_id(plugin_child_id) { | 79 plugin_child_id(plugin_child_id) { |
77 } | 80 } |
78 | 81 |
79 NaClLaunchResult::~NaClLaunchResult() { | 82 NaClLaunchResult::~NaClLaunchResult() { |
80 } | 83 } |
81 | 84 |
82 } // namespace nacl | 85 } // namespace nacl |
OLD | NEW |