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

Unified Diff: components/nacl/loader/nacl_helper_linux.cc

Issue 1059233004: Init Mojo embedder for Windows NaCl plugins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 | « components/nacl.gyp ('k') | components/nacl/loader/nacl_helper_win_64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/loader/nacl_helper_linux.cc
diff --git a/components/nacl/loader/nacl_helper_linux.cc b/components/nacl/loader/nacl_helper_linux.cc
index 3ad69b3d2113d727bb59002001e549d85c2697e5..7076044e31d9a26d80a09d5c75eed79cb6dc0582 100644
--- a/components/nacl/loader/nacl_helper_linux.cc
+++ b/components/nacl/loader/nacl_helper_linux.cc
@@ -43,6 +43,11 @@
#include "ipc/ipc_switches.h"
#include "sandbox/linux/services/libc_urandom_override.h"
+#if !defined(OS_NACL_NONSFI)
+#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
+#include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h"
+#endif
+
#if defined(OS_NACL_NONSFI)
#include "native_client/src/public/nonsfi/irt_exception_handling.h"
#else
@@ -459,6 +464,12 @@ int main(int argc, char* argv[]) {
CheckRDebug(argv[0]);
#endif
+// TODO(teravest): Enable mojo for nonsfi. http://crbug.com/473418
+#if !defined(OS_NACL_NONSFI)
+ mojo::embedder::Init(
+ make_scoped_ptr(new mojo::embedder::SimplePlatformSupport()));
+#endif
+
scoped_ptr<nacl::NaClSandbox> nacl_sandbox(new nacl::NaClSandbox);
// Make sure that the early initialization did not start any spurious
// threads.
« no previous file with comments | « components/nacl.gyp ('k') | components/nacl/loader/nacl_helper_win_64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698