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

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..d85c043c908f748812a39c4662fe4078b36780b0 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
+
Mark Seaborn 2013/12/17 21:18:55 Nit: remove one empty line here so that there's no
hidehiko 2013/12/18 08:38:03 Done.
+
+#if defined(OS_LINUX)
+ if (params.enable_nonsfi_mode) {
+ nacl::nonsfi::MainStart(args->imc_bootstrap_handle);
+ NOTREACHED();
+ return;
+ }
+#endif
NaClChromeMainStart(args);
NOTREACHED();
}

Powered by Google App Engine
This is Rietveld 408576698