diff options
| author | cbiffle@google.com <cbiffle@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 23:12:43 +0000 |
|---|---|---|
| committer | cbiffle@google.com <cbiffle@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 23:12:43 +0000 |
| commit | 8f05f7f2ef3eddee9a305d5c40b315ac767f44c5 (patch) | |
| tree | 1e7e63bb90561032c0290c67b2efe6c401a0d6fb /chrome/renderer/render_process_impl.cc | |
| parent | 21ae1f956c163bc0e3b3e239b5c027a7ac93ae7f (diff) | |
| download | chromium_src-8f05f7f2ef3eddee9a305d5c40b315ac767f44c5.zip chromium_src-8f05f7f2ef3eddee9a305d5c40b315ac767f44c5.tar.gz chromium_src-8f05f7f2ef3eddee9a305d5c40b315ac767f44c5.tar.bz2 | |
Altered the logic that determines when NaCl is enabled. Previously, we required an explicit command-line flag to use NaCl. This enables NaCl without a flag for apps and extensions that have the special "native_client" permission.
Note that this causes the NaCl plugin to be registered unconditionally. We need this, since at the time plugin registration is happening it's not clear whether we're in an extension/app.
BUG=45881
TEST=none yet
Review URL: http://codereview.chromium.org/3057025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_process_impl.cc')
| -rw-r--r-- | chrome/renderer/render_process_impl.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chrome/renderer/render_process_impl.cc b/chrome/renderer/render_process_impl.cc index 59fe985..34f3ef8 100644 --- a/chrome/renderer/render_process_impl.cc +++ b/chrome/renderer/render_process_impl.cc @@ -184,14 +184,12 @@ RenderProcessImpl::RenderProcessImpl() } #ifndef DISABLE_NACL - if (command_line.HasSwitch(switches::kInternalNaCl)) { - std::map<std::string, uintptr_t> funcs; - funcs["launch_nacl_process"] = - reinterpret_cast<uintptr_t>(LaunchNaClProcess); - funcs["launch_nacl_process_multi_fd"] = - reinterpret_cast<uintptr_t>(LaunchNaClProcessMultiFD); - RegisterInternalNaClPlugin(funcs); - } + std::map<std::string, uintptr_t> funcs; + funcs["launch_nacl_process"] = + reinterpret_cast<uintptr_t>(LaunchNaClProcess); + funcs["launch_nacl_process_multi_fd"] = + reinterpret_cast<uintptr_t>(LaunchNaClProcessMultiFD); + RegisterInternalNaClPlugin(funcs); #endif if (!command_line.HasSwitch(switches::kDisableByteRangeSupport)) { |