diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 23:07:04 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 23:07:04 +0000 |
| commit | e46177921cafffdf8d911d92388f6d3b66483817 (patch) | |
| tree | 7857dafa96f2eb9b76e1a013a875abc9d1120ac0 /chrome/common/render_messages.h | |
| parent | a86c93c574d51e430b89b41a18f72924614ade6e (diff) | |
| download | chromium_src-e46177921cafffdf8d911d92388f6d3b66483817.zip chromium_src-e46177921cafffdf8d911d92388f6d3b66483817.tar.gz chromium_src-e46177921cafffdf8d911d92388f6d3b66483817.tar.bz2 | |
Add an IPC channel between the NaCl loader process and the renderer.
BUG=116317
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/10214007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/render_messages.h')
| -rw-r--r-- | chrome/common/render_messages.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index ff023cf..c4191ca 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -26,6 +26,7 @@ #include "chrome/common/translate_errors.h" #include "content/public/common/common_param_traits.h" #include "content/public/common/webkit_param_traits.h" +#include "ipc/ipc_channel_handle.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_platform_file.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -485,12 +486,14 @@ IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_ForwardMessageToExternalHost, // A renderer sends this to the browser process when it wants to start // a new instance of the Native Client process. The browser will launch -// the process and return a handle to an IMC channel. -IPC_SYNC_MESSAGE_CONTROL2_1(ChromeViewHostMsg_LaunchNaCl, +// the process and return an IPC channel handle. This handle will only +// be valid if the NaCl IPC proxy is enabled. +IPC_SYNC_MESSAGE_CONTROL2_2(ChromeViewHostMsg_LaunchNaCl, GURL /* manifest_url */, int /* socket count */, std::vector<nacl::FileDescriptor> - /* imc channel handles */) + /* imc channel handles */, + IPC::ChannelHandle /* ipc_channel_handle */) // Notification that the page has an OpenSearch description document // associated with it. |