diff options
author | dspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 20:13:08 +0000 |
---|---|---|
committer | dspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 20:13:08 +0000 |
commit | 84638c7803f273f97679ea948609c05f6d5cbafa (patch) | |
tree | 627566c226998f3bdf5a9990ea848ceb8d16d0ff /chrome/browser/nacl_host | |
parent | acee2cc4ffddb4b9ea10a3665c54eb80d24c2fef (diff) | |
download | chromium_src-84638c7803f273f97679ea948609c05f6d5cbafa.zip chromium_src-84638c7803f273f97679ea948609c05f6d5cbafa.tar.gz chromium_src-84638c7803f273f97679ea948609c05f6d5cbafa.tar.bz2 |
Remove the --enable-nacl-on-mac flag, since the syscall thunking code is secure
now. The mac no longer needs 2 flags in order to load .nexes, it is only
behind the --internal-nacl flag like everyone else.
BUG=328 (tracked in the Native Client project)
TEST=Run Chrome on a Mac without the --enable-nacl-on-mac flag, and load a
.nexe. It should work.
Review URL: http://codereview.chromium.org/661370
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/nacl_host')
-rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 2b3ebd2..9a08d54 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -86,14 +86,6 @@ bool NaClProcessHost::LaunchSelLdr() { CommandLine* cmd_line = new CommandLine(exe_path); nacl::CopyNaClCommandLineArguments(cmd_line); -#if defined(OS_MACOSX) - // TODO(dspringer): NaCl is temporalrily disabled on the Mac by default, but - // it can be enabled with the --enable-nacl cmd-line switch. Remove this check - // when the security issues in the Mac PIC code are resolved. - if (!cmd_line->HasSwitch(switches::kEnableNaClOnMac)) - return false; -#endif - cmd_line->AppendSwitchWithValue(switches::kProcessType, switches::kNaClLoaderProcess); @@ -106,7 +98,7 @@ bool NaClProcessHost::LaunchSelLdr() { NaClBrokerService::GetInstance()->Init(resource_dispatcher_host_); NaClBrokerService::GetInstance()->LaunchLoader(this, ASCIIToWide(channel_id())); - } else + } else // NO_LINT #endif ChildProcessHost::Launch( #if defined(OS_WIN) |