OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/zygote_host_linux.h" | 5 #include "content/browser/zygote_host_linux.h" |
6 | 6 |
7 #include <sys/socket.h> | 7 #include <sys/socket.h> |
8 #include <sys/stat.h> | 8 #include <sys/stat.h> |
9 #include <sys/types.h> | 9 #include <sys/types.h> |
10 #include <unistd.h> | 10 #include <unistd.h> |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 // Should this list be obtained from browser_render_process_host.cc? | 106 // Should this list be obtained from browser_render_process_host.cc? |
107 static const char* kForwardSwitches[] = { | 107 static const char* kForwardSwitches[] = { |
108 switches::kAllowSandboxDebugging, | 108 switches::kAllowSandboxDebugging, |
109 switches::kLoggingLevel, | 109 switches::kLoggingLevel, |
110 switches::kEnableLogging, // Support, e.g., --enable-logging=stderr. | 110 switches::kEnableLogging, // Support, e.g., --enable-logging=stderr. |
111 switches::kV, | 111 switches::kV, |
112 switches::kVModule, | 112 switches::kVModule, |
113 switches::kRegisterPepperPlugins, | 113 switches::kRegisterPepperPlugins, |
114 switches::kDisableSeccompSandbox, | 114 switches::kDisableSeccompSandbox, |
115 switches::kEnableSeccompSandbox, | 115 switches::kEnableSeccompSandbox, |
116 switches::kNaClLinuxHelper, | |
117 }; | 116 }; |
118 cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches, | 117 cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches, |
119 arraysize(kForwardSwitches)); | 118 arraysize(kForwardSwitches)); |
120 | 119 |
121 content::GetContentClient()->browser()->AppendExtraCommandLineSwitches( | 120 content::GetContentClient()->browser()->AppendExtraCommandLineSwitches( |
122 &cmd_line, -1); | 121 &cmd_line, -1); |
123 | 122 |
124 sandbox_binary_ = sandbox_cmd.c_str(); | 123 sandbox_binary_ = sandbox_cmd.c_str(); |
125 | 124 |
126 if (!sandbox_cmd.empty()) { | 125 if (!sandbox_cmd.empty()) { |
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 !read_pickle.ReadInt(&iter, &tmp_exit_code)) { | 395 !read_pickle.ReadInt(&iter, &tmp_exit_code)) { |
397 LOG(WARNING) << "Error parsing GetTerminationStatus response from zygote."; | 396 LOG(WARNING) << "Error parsing GetTerminationStatus response from zygote."; |
398 return base::TERMINATION_STATUS_NORMAL_TERMINATION; | 397 return base::TERMINATION_STATUS_NORMAL_TERMINATION; |
399 } | 398 } |
400 | 399 |
401 if (exit_code) | 400 if (exit_code) |
402 *exit_code = tmp_exit_code; | 401 *exit_code = tmp_exit_code; |
403 | 402 |
404 return static_cast<base::TerminationStatus>(status); | 403 return static_cast<base::TerminationStatus>(status); |
405 } | 404 } |
OLD | NEW |