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

Unified Diff: ppapi/nacl_irt/irt_start.cc

Issue 2305913002: Use ChannelMojo from the browser to NaCl loader process. (Closed)
Patch Set: Created 4 years, 3 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
Index: ppapi/nacl_irt/irt_start.cc
diff --git a/ppapi/nacl_irt/irt_start.cc b/ppapi/nacl_irt/irt_start.cc
index 9390acecf5719ec37871ec92ad0baf7b0cb1f9d6..c1c980152e1ae66186f2b0a14762e5b75721a37d 100644
--- a/ppapi/nacl_irt/irt_start.cc
+++ b/ppapi/nacl_irt/irt_start.cc
@@ -11,6 +11,7 @@
#include <stdint.h>
#include "base/at_exit.h"
+#include "mojo/edk/embedder/embedder.h"
#include "native_client/src/public/chrome_main.h"
#include "native_client/src/public/irt_core.h"
#include "ppapi/nacl_irt/irt_interfaces.h"
@@ -35,6 +36,10 @@ void nacl_irt_start(uint32_t* info) {
MakeIPCHandle("NaCl Browser", NACL_CHROME_DESC_BASE),
MakeIPCHandle("NaCl Renderer", NACL_CHROME_DESC_BASE + 1),
MakeIPCHandle("NaCl Manifest", NACL_CHROME_DESC_BASE + 2));
+
+ // The Mojo EDK must be initialized before using IPC.
+ mojo::edk::Init();
+
ppapi::StartUpPlugin();
nacl_irt_enter_user_code(info, chrome_irt_query);

Powered by Google App Engine
This is Rietveld 408576698