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

Unified Diff: chrome/nacl/nacl_fork_delegate_linux.cc

Issue 7821021: Enable nacl_helper by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Eliminate --nacl-linux-helper flag Created 9 years, 4 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/nacl/nacl_fork_delegate_linux.cc
diff --git a/chrome/nacl/nacl_fork_delegate_linux.cc b/chrome/nacl/nacl_fork_delegate_linux.cc
index 26fae5386d13f478ddc16b7a28ae88db6d728b45..93b0a8415482488e2ea4ed0c5e5f430c6295cc0c 100644
--- a/chrome/nacl/nacl_fork_delegate_linux.cc
+++ b/chrome/nacl/nacl_fork_delegate_linux.cc
@@ -44,15 +44,10 @@ void NaClForkDelegate::Init(const bool sandboxed,
base::file_handle_mapping_vector fds_to_map;
fds_to_map.push_back(std::make_pair(fds[1], kNaClZygoteDescriptor));
fds_to_map.push_back(std::make_pair(sandboxdesc, kNaClSandboxDescriptor));
- // TODO(bradchen): To make this the default for release builds,
- // remove command line switch.
ready_ = false;
- const bool use_helper = CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kNaClLinuxHelper);
FilePath helper_exe;
FilePath helper_bootstrap_exe;
- if (use_helper &&
- PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe) &&
+ if (PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe) &&
PathService::Get(chrome::FILE_NACL_HELPER_BOOTSTRAP,
&helper_bootstrap_exe)) {
CommandLine::StringVector argv = CommandLine::ForCurrentProcess()->argv();
« no previous file with comments | « chrome/browser/extensions/extension_nacl_browsertest.cc ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698