Index: components/nacl/loader/nacl_listener.cc |
diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc |
index cd175dda5f6e0aa540f0c25fed7ebd8aa4ee2906..b2121fc98188c653a05a146cd2bd81180ea068b5 100644 |
--- a/components/nacl/loader/nacl_listener.cc |
+++ b/components/nacl/loader/nacl_listener.cc |
@@ -32,6 +32,7 @@ |
#endif |
#if defined(OS_LINUX) |
+#include "components/nacl/loader/nonsfi/nonsfi_main.h" |
#include "content/public/common/child_process_sandbox_support_linux.h" |
#endif |
@@ -331,6 +332,15 @@ void NaClListener::OnStart(const nacl::NaClStartParams& params) { |
#if defined(OS_LINUX) |
args->prereserved_sandbox_size = prereserved_sandbox_size_; |
#endif |
- NaClChromeMainStart(args); |
+ |
+ |
+#if defined(OS_LINUX) |
+ if (params.enable_nonsfi_mode) { |
+ nacl::nonsfi::MainStart(args->imc_bootstrap_handle); |
+ } else |
Mark Seaborn
2013/12/10 19:56:44
You could avoid the awkward dangling else by doing
hidehiko
2013/12/11 07:56:14
Done.
|
+#endif |
+ { |
+ NaClChromeMainStart(args); |
+ } |
NOTREACHED(); |
} |