summaryrefslogtreecommitdiffstats
path: root/chrome/browser/nacl_process_host.cc
diff options
context:
space:
mode:
authorgregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-22 17:42:32 +0000
committergregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-22 17:42:32 +0000
commit2461cf0a67fec9bf61c5c80ca64a9a234c0d0e8d (patch)
tree9c8c5cce5d316c41019ba7f7c6fcccc43d272862 /chrome/browser/nacl_process_host.cc
parent0ba99697453983e547ea145251b802daf0fbca90 (diff)
downloadchromium_src-2461cf0a67fec9bf61c5c80ca64a9a234c0d0e8d.zip
chromium_src-2461cf0a67fec9bf61c5c80ca64a9a234c0d0e8d.tar.gz
chromium_src-2461cf0a67fec9bf61c5c80ca64a9a234c0d0e8d.tar.bz2
Add support for IMC handle passing in Chrome sandbox
Review URL: http://codereview.chromium.org/292056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/nacl_process_host.cc')
-rw-r--r--chrome/browser/nacl_process_host.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/nacl_process_host.cc b/chrome/browser/nacl_process_host.cc
index 9d7f445..dcd3401 100644
--- a/chrome/browser/nacl_process_host.cc
+++ b/chrome/browser/nacl_process_host.cc
@@ -41,8 +41,8 @@ NaClProcessHost::NaClProcessHost(
bool NaClProcessHost::Launch(ResourceMessageFilter* renderer_msg_filter,
const int descriptor,
nacl::FileDescriptor* imc_handle,
- nacl::FileDescriptor* nacl_process_handle,
- int* nacl_process_id) {
+ base::ProcessHandle* nacl_process_handle,
+ base::ProcessId* nacl_process_id) {
#ifdef DISABLE_NACL
NOTIMPLEMENTED() << "Native Client disabled at build time";
return false;
@@ -51,7 +51,7 @@ bool NaClProcessHost::Launch(ResourceMessageFilter* renderer_msg_filter,
bool success = false;
NATIVE_HANDLE(*imc_handle) = nacl::kInvalidHandle;
- NATIVE_HANDLE(*nacl_process_handle) = nacl::kInvalidHandle;
+ *nacl_process_handle = nacl::kInvalidHandle;
*nacl_process_id = 0;
// Create a connected socket
@@ -97,8 +97,9 @@ bool NaClProcessHost::Launch(ResourceMessageFilter* renderer_msg_filter,
imc_handle->fd = pair[0];
imc_handle->auto_close = true;
- // Process handles are used on Windows only
- NATIVE_HANDLE(*nacl_process_handle) = nacl::kInvalidHandle;
+ // We use pid as process handle on Posix
+ *nacl_process_handle = handle();
+
#endif
// Get the pid of the NaCl process