OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser_child_process_host_impl.h" | 5 #include "content/browser/browser_child_process_host_impl.h" |
6 | 6 |
7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 | 140 |
141 GetContentClient()->browser()->AppendExtraCommandLineSwitches( | 141 GetContentClient()->browser()->AppendExtraCommandLineSwitches( |
142 cmd_line, data_.id); | 142 cmd_line, data_.id); |
143 | 143 |
144 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); | 144 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); |
145 static const char* kForwardSwitches[] = { | 145 static const char* kForwardSwitches[] = { |
146 switches::kDisableLogging, | 146 switches::kDisableLogging, |
147 switches::kEnableDCHECK, | 147 switches::kEnableDCHECK, |
148 switches::kEnableLogging, | 148 switches::kEnableLogging, |
149 switches::kLoggingLevel, | 149 switches::kLoggingLevel, |
| 150 switches::kTraceToConsole, |
150 switches::kV, | 151 switches::kV, |
151 switches::kVModule, | 152 switches::kVModule, |
152 #if defined(OS_POSIX) | 153 #if defined(OS_POSIX) |
153 switches::kChildCleanExit, | 154 switches::kChildCleanExit, |
154 #endif | 155 #endif |
155 }; | 156 }; |
156 cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches, | 157 cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches, |
157 arraysize(kForwardSwitches)); | 158 arraysize(kForwardSwitches)); |
158 | 159 |
159 child_process_.reset(new ChildProcessLauncher( | 160 child_process_.reset(new ChildProcessLauncher( |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
343 | 344 |
344 void BrowserChildProcessHostImpl::OnProcessExitedEarly( | 345 void BrowserChildProcessHostImpl::OnProcessExitedEarly( |
345 base::WaitableEvent* event) { | 346 base::WaitableEvent* event) { |
346 DeleteProcessWaitableEvent(event); | 347 DeleteProcessWaitableEvent(event); |
347 OnChildDisconnected(); | 348 OnChildDisconnected(); |
348 } | 349 } |
349 | 350 |
350 #endif | 351 #endif |
351 | 352 |
352 } // namespace content | 353 } // namespace content |
OLD | NEW |