components/nacl/loader/nacl_main.cc - Issue 299703016: Gate disabling nacl code on proper gyp flags, etc.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 299703016: Gate disabling nacl code on proper gyp flags, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix guard on flags code Created 6 years, 7 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:

Index: components/nacl/loader/nacl_main.cc

diff --git a/components/nacl/loader/nacl_main.cc b/components/nacl/loader/nacl_main.cc

index 15b6fd2dc8cb16e6497876978addc6cca74812b7..9375d1c4af1c3dd484a581882179b4b1c8915b04 100644

--- a/components/nacl/loader/nacl_main.cc

+++ b/components/nacl/loader/nacl_main.cc

@@ -27,7 +27,8 @@ int NaClMain(const content::MainFunctionParams& parameters) {

base::PowerMonitor power_monitor(power_monitor_source.Pass());

base::HighResolutionTimerManager hi_res_timer_manager;

-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)

+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \

+ defined(OS_ANDROID)

NaClMainPlatformDelegate platform(parameters);

bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox);

« no previous file with comments | « chrome/browser/about_flags.cc ('k') | components/nacl/nacl_defines.gypi » ('j') | no next file with comments »