summaryrefslogtreecommitdiffstats
path: root/ppapi/c
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-15 22:30:20 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-15 22:30:20 +0000
commitade946b0f3caa36e82ce2bf0a58da556c0b329c7 (patch)
treea1b74335b243bce1d712204643fec65d95c003cc /ppapi/c
parentf6257e3f6b5ef909bb35b8e410d6f6a0b04295d1 (diff)
downloadchromium_src-ade946b0f3caa36e82ce2bf0a58da556c0b329c7.zip
chromium_src-ade946b0f3caa36e82ce2bf0a58da556c0b329c7.tar.gz
chromium_src-ade946b0f3caa36e82ce2bf0a58da556c0b329c7.tar.bz2
Add an instance parameter to PPB_NaCl_Private::LaunchSelLdr.
BUG=116317 TEST=compiles Review URL: https://chromiumcodereview.appspot.com/10343005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/c')
-rw-r--r--ppapi/c/private/ppb_nacl_private.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/ppapi/c/private/ppb_nacl_private.h b/ppapi/c/private/ppb_nacl_private.h
index 1dcc9ee..dc7e7a2 100644
--- a/ppapi/c/private/ppb_nacl_private.h
+++ b/ppapi/c/private/ppb_nacl_private.h
@@ -5,10 +5,12 @@
#ifndef PPAPI_C_PRIVATE_PPB_NACL_UTIL_PRIVATE_H_
#define PPAPI_C_PRIVATE_PPB_NACL_UTIL_PRIVATE_H_
+#include "ppapi/c/pp_bool.h"
+#include "ppapi/c/pp_instance.h"
#include "ppapi/c/pp_resource.h"
#include "ppapi/c/pp_stdint.h"
-#define PPB_NACL_PRIVATE_INTERFACE "PPB_NaCl(Private);0.4"
+#define PPB_NACL_PRIVATE_INTERFACE "PPB_NaCl(Private);0.5"
struct PPB_NaCl_Private {
// This function launches NaCl's sel_ldr process. On success, the function
@@ -16,8 +18,14 @@ struct PPB_NaCl_Private {
// write |socket_count| nacl::Handles to imc_handles. Unless
// EnableBackgroundSelLdrLaunch is called, this method must be invoked from
// the main thread.
- bool (*LaunchSelLdr)(const char* alleged_url, int socket_count,
- void* imc_handles);
+ PP_Bool (*LaunchSelLdr)(PP_Instance instance,
+ const char* alleged_url,
+ int socket_count,
+ void* imc_handles);
+
+ // This function starts the PPAPI proxy so the nexe can communicate with the
+ // browser's renderer process.
+ PP_Bool (*StartPpapiProxy)(PP_Instance instance);
// On POSIX systems, this function returns the file descriptor of
// /dev/urandom. On non-POSIX systems, this function returns 0.