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

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

Issue 100373005: Initial implementation of Bare Metal Mode for NaCl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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: 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();
}

Powered by Google App Engine
This is Rietveld 408576698