Chromium Code Reviews| Index: components/nacl/loader/nacl_helper_win_64.cc |
| diff --git a/components/nacl/loader/nacl_helper_win_64.cc b/components/nacl/loader/nacl_helper_win_64.cc |
| index d67b7b32715fdce43920b87aa012236bd3b9e4f1..7dfc376f07a4d044aec9b5d1f2cf2a955b293a15 100644 |
| --- a/components/nacl/loader/nacl_helper_win_64.cc |
| +++ b/components/nacl/loader/nacl_helper_win_64.cc |
| @@ -20,6 +20,8 @@ |
| #include "content/public/common/main_function_params.h" |
| #include "content/public/common/sandbox_init.h" |
| #include "sandbox/win/src/sandbox_types.h" |
| +#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
| +#include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" |
| extern int NaClMain(const content::MainFunctionParams&); |
| @@ -62,6 +64,8 @@ int NaClWin64Main() { |
| // Route stdio to parent console (if any) or create one. |
| if (command_line.HasSwitch(switches::kEnableLogging)) |
| base::RouteStdioToConsole(); |
| + mojo::embedder::Init( |
| + make_scoped_ptr(new mojo::embedder::SimplePlatformSupport())); |
|
Nick Bray (chromium)
2015/04/02 01:22:00
What about win32? Are we guaranteed Mojo is initi
|
| // Initialize the sandbox for this process. |
| bool sandbox_initialized_ok = content::InitializeSandbox(&sandbox_info); |