Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Unified Diff: mojo/nacl/monacl_sel_main.cc

Issue 884303002: Launch nexes from mojo_shell. Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Edits Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/nacl/monacl_sel_main.h ('k') | mojo/nacl/monacl_shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/nacl/monacl_sel_main.cc
diff --git a/mojo/nacl/monacl_sel_main.cc b/mojo/nacl/monacl_sel_main.cc
index 4fbc5757b6992004b27587f64c6cdfd5ac6a658b..15537870f785e6636c01395beb26283fda2deedf 100644
--- a/mojo/nacl/monacl_sel_main.cc
+++ b/mojo/nacl/monacl_sel_main.cc
@@ -14,8 +14,11 @@
namespace mojo {
-void LaunchNaCl(const char* nexe_file, const char* irt_file,
- int app_argc, char* app_argv[]) {
+void LaunchNaCl(const char* nexe_file,
+ const char* irt_file,
+ int app_argc,
+ char* app_argv[],
+ MojoHandle handle) {
NaClChromeMainInit();
// Open the IRT.
@@ -42,7 +45,7 @@ void LaunchNaCl(const char* nexe_file, const char* irt_file,
args->argv = app_argv;
struct NaClApp* nap = NaClAppCreate();
- InjectMojo(nap);
+ InjectMojo(nap, handle);
int exit_status = 1;
NaClChromeMainStart(nap, args, &exit_status);
« no previous file with comments | « mojo/nacl/monacl_sel_main.h ('k') | mojo/nacl/monacl_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698