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/debug/alias.h" | 10 #include "base/debug/alias.h" |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 std::unique_ptr<base::CommandLine> cmd_line, | 212 std::unique_ptr<base::CommandLine> cmd_line, |
213 bool terminate_on_shutdown) { | 213 bool terminate_on_shutdown) { |
214 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 214 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
215 | 215 |
216 GetContentClient()->browser()->AppendExtraCommandLineSwitches(cmd_line.get(), | 216 GetContentClient()->browser()->AppendExtraCommandLineSwitches(cmd_line.get(), |
217 data_.id); | 217 data_.id); |
218 | 218 |
219 const base::CommandLine& browser_command_line = | 219 const base::CommandLine& browser_command_line = |
220 *base::CommandLine::ForCurrentProcess(); | 220 *base::CommandLine::ForCurrentProcess(); |
221 static const char* const kForwardSwitches[] = { | 221 static const char* const kForwardSwitches[] = { |
222 switches::kDisableLogging, | 222 switches::kDisableInProcessStackTraces, |
223 switches::kEnableLogging, | 223 switches::kDisableLogging, |
224 switches::kIPCConnectionTimeout, | 224 switches::kEnableLogging, |
225 switches::kLoggingLevel, | 225 switches::kIPCConnectionTimeout, |
226 switches::kTraceToConsole, | 226 switches::kLoggingLevel, |
227 switches::kV, | 227 switches::kTraceToConsole, |
228 switches::kVModule, | 228 switches::kV, |
| 229 switches::kVModule, |
229 }; | 230 }; |
230 cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches, | 231 cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches, |
231 arraysize(kForwardSwitches)); | 232 arraysize(kForwardSwitches)); |
232 | 233 |
233 if (child_connection_) { | 234 if (child_connection_) { |
234 cmd_line->AppendSwitchASCII(switches::kServiceRequestChannelToken, | 235 cmd_line->AppendSwitchASCII(switches::kServiceRequestChannelToken, |
235 child_connection_->service_token()); | 236 child_connection_->service_token()); |
236 } | 237 } |
237 | 238 |
238 notify_child_disconnected_ = true; | 239 notify_child_disconnected_ = true; |
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
590 | 591 |
591 #if defined(OS_WIN) | 592 #if defined(OS_WIN) |
592 | 593 |
593 void BrowserChildProcessHostImpl::OnObjectSignaled(HANDLE object) { | 594 void BrowserChildProcessHostImpl::OnObjectSignaled(HANDLE object) { |
594 OnChildDisconnected(); | 595 OnChildDisconnected(); |
595 } | 596 } |
596 | 597 |
597 #endif | 598 #endif |
598 | 599 |
599 } // namespace content | 600 } // namespace content |
OLD | NEW |