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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 ppapi_ipc_channel_handle(), | 64 ppapi_ipc_channel_handle(), |
65 trusted_ipc_channel_handle(), | 65 trusted_ipc_channel_handle(), |
66 plugin_pid(base::kNullProcessId), | 66 plugin_pid(base::kNullProcessId), |
67 plugin_child_id(0) { | 67 plugin_child_id(0) { |
68 } | 68 } |
69 | 69 |
70 NaClLaunchResult::NaClLaunchResult( | 70 NaClLaunchResult::NaClLaunchResult( |
71 FileDescriptor imc_channel_handle, | 71 FileDescriptor imc_channel_handle, |
72 const IPC::ChannelHandle& ppapi_ipc_channel_handle, | 72 const IPC::ChannelHandle& ppapi_ipc_channel_handle, |
73 const IPC::ChannelHandle& trusted_ipc_channel_handle, | 73 const IPC::ChannelHandle& trusted_ipc_channel_handle, |
| 74 const IPC::ChannelHandle& embedder_service_ipc_channel_handle, |
74 base::ProcessId plugin_pid, | 75 base::ProcessId plugin_pid, |
75 int plugin_child_id) | 76 int plugin_child_id) |
76 : imc_channel_handle(imc_channel_handle), | 77 : imc_channel_handle(imc_channel_handle), |
77 ppapi_ipc_channel_handle(ppapi_ipc_channel_handle), | 78 ppapi_ipc_channel_handle(ppapi_ipc_channel_handle), |
78 trusted_ipc_channel_handle(trusted_ipc_channel_handle), | 79 trusted_ipc_channel_handle(trusted_ipc_channel_handle), |
| 80 embedder_service_ipc_channel_handle( |
| 81 embedder_service_ipc_channel_handle), |
79 plugin_pid(plugin_pid), | 82 plugin_pid(plugin_pid), |
80 plugin_child_id(plugin_child_id) { | 83 plugin_child_id(plugin_child_id) { |
81 } | 84 } |
82 | 85 |
83 NaClLaunchResult::~NaClLaunchResult() { | 86 NaClLaunchResult::~NaClLaunchResult() { |
84 } | 87 } |
85 | 88 |
86 } // namespace nacl | 89 } // namespace nacl |
OLD | NEW |