summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 04:27:43 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 04:27:43 +0000
commit338466a8586c58074b8ffb9fcc0d8739a9ff2729 (patch)
tree93cfefbf64c382aee5b3972b8781dbd59f94567f /chrome/common
parentacf668bc247c7d432ca6b4e348d1dcdbef408557 (diff)
downloadchromium_src-338466a8586c58074b8ffb9fcc0d8739a9ff2729.zip
chromium_src-338466a8586c58074b8ffb9fcc0d8739a9ff2729.tar.gz
chromium_src-338466a8586c58074b8ffb9fcc0d8739a9ff2729.tar.bz2
NaCl: Send the integrated runtime (IRT) library to NaCl
Change the browser process to open the IRT file and send it to the nascent NaCl process. If the IRT file is not present, handle this gracefully while still allowing the NaCl process to run. This is because there may be corner cases to sort out for getting the IRT into the various Chrome install images. In the mean time, NaCl executables that are not built to use the IRT should continue to work. BUG=http://code.google.com/p/nativeclient/issues/detail?id=1595 TEST=nacl_integration on the Chrome trybot Review URL: http://codereview.chromium.org/6873133 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/nacl_messages.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/common/nacl_messages.h b/chrome/common/nacl_messages.h
index bcc99fc..5f4aaa6 100644
--- a/chrome/common/nacl_messages.h
+++ b/chrome/common/nacl_messages.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -20,8 +20,9 @@
// NaClProcess messages
// These are messages sent from the browser to the NaCl process.
// Tells the NaCl process to start.
-IPC_MESSAGE_CONTROL1(NaClProcessMsg_Start,
- std::vector<nacl::FileDescriptor> /* sockets */)
+IPC_MESSAGE_CONTROL2(NaClProcessMsg_Start,
+ std::vector<nacl::FileDescriptor> /* sockets */,
+ bool /* have_irt_file */)
// Tells the NaCl broker to launch a NaCl loader process.
IPC_MESSAGE_CONTROL1(NaClProcessMsg_LaunchLoaderThroughBroker,