OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/browser/zygote_host_linux.h" | 5 #include "chrome/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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 cmd_line.PrependWrapper(prefix); | 80 cmd_line.PrependWrapper(prefix); |
81 } | 81 } |
82 // Append any switches from the browser process that need to be forwarded on | 82 // Append any switches from the browser process that need to be forwarded on |
83 // to the zygote/renderers. | 83 // to the zygote/renderers. |
84 // Should this list be obtained from browser_render_process_host.cc? | 84 // Should this list be obtained from browser_render_process_host.cc? |
85 if (browser_command_line.HasSwitch(switches::kAllowSandboxDebugging)) { | 85 if (browser_command_line.HasSwitch(switches::kAllowSandboxDebugging)) { |
86 cmd_line.AppendSwitch(switches::kAllowSandboxDebugging); | 86 cmd_line.AppendSwitch(switches::kAllowSandboxDebugging); |
87 } | 87 } |
88 if (browser_command_line.HasSwitch(switches::kLoggingLevel)) { | 88 if (browser_command_line.HasSwitch(switches::kLoggingLevel)) { |
89 cmd_line.AppendSwitchWithValue(switches::kLoggingLevel, | 89 cmd_line.AppendSwitchWithValue(switches::kLoggingLevel, |
90 browser_command_line.GetSwitchValue( | 90 browser_command_line.GetSwitchValueASCII( |
91 switches::kLoggingLevel)); | 91 switches::kLoggingLevel)); |
92 } | 92 } |
93 if (browser_command_line.HasSwitch(switches::kEnableLogging)) { | 93 if (browser_command_line.HasSwitch(switches::kEnableLogging)) { |
94 // Append with value to support --enable-logging=stderr. | 94 // Append with value to support --enable-logging=stderr. |
95 cmd_line.AppendSwitchWithValue(switches::kEnableLogging, | 95 cmd_line.AppendSwitchWithValue(switches::kEnableLogging, |
96 browser_command_line.GetSwitchValue( | 96 browser_command_line.GetSwitchValueASCII( |
97 switches::kEnableLogging)); | 97 switches::kEnableLogging)); |
98 } | 98 } |
99 if (browser_command_line.HasSwitch(switches::kEnableSeccompSandbox)) { | 99 if (browser_command_line.HasSwitch(switches::kEnableSeccompSandbox)) { |
100 cmd_line.AppendSwitch(switches::kEnableSeccompSandbox); | 100 cmd_line.AppendSwitch(switches::kEnableSeccompSandbox); |
101 } | 101 } |
102 | 102 |
103 const char* sandbox_binary = sandbox_cmd.c_str(); | 103 const char* sandbox_binary = sandbox_cmd.c_str(); |
104 struct stat st; | 104 struct stat st; |
105 | 105 |
106 bool using_suid_sandbox = false; | 106 bool using_suid_sandbox = false; |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 !read_pickle.ReadBool(&iter, &tmp_child_exited)) { | 247 !read_pickle.ReadBool(&iter, &tmp_child_exited)) { |
248 LOG(WARNING) << "Error parsing DidProcessCrash response from zygote."; | 248 LOG(WARNING) << "Error parsing DidProcessCrash response from zygote."; |
249 return false; | 249 return false; |
250 } | 250 } |
251 | 251 |
252 if (child_exited) | 252 if (child_exited) |
253 *child_exited = tmp_child_exited; | 253 *child_exited = tmp_child_exited; |
254 | 254 |
255 return did_crash; | 255 return did_crash; |
256 } | 256 } |
OLD | NEW |