| 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/dump_without_crashing.h" | 10 #include "base/debug/dump_without_crashing.h" |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 const base::CommandLine& browser_command_line = | 157 const base::CommandLine& browser_command_line = |
| 158 *base::CommandLine::ForCurrentProcess(); | 158 *base::CommandLine::ForCurrentProcess(); |
| 159 static const char* kForwardSwitches[] = { | 159 static const char* kForwardSwitches[] = { |
| 160 switches::kDisableLogging, | 160 switches::kDisableLogging, |
| 161 switches::kEnableLogging, | 161 switches::kEnableLogging, |
| 162 switches::kIPCConnectionTimeout, | 162 switches::kIPCConnectionTimeout, |
| 163 switches::kLoggingLevel, | 163 switches::kLoggingLevel, |
| 164 switches::kTraceToConsole, | 164 switches::kTraceToConsole, |
| 165 switches::kV, | 165 switches::kV, |
| 166 switches::kVModule, | 166 switches::kVModule, |
| 167 "use-new-edk", // TODO(use_chrome_edk): temporary. |
| 167 }; | 168 }; |
| 168 cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches, | 169 cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches, |
| 169 arraysize(kForwardSwitches)); | 170 arraysize(kForwardSwitches)); |
| 170 | 171 |
| 171 child_process_.reset(new ChildProcessLauncher( | 172 child_process_.reset(new ChildProcessLauncher( |
| 172 delegate, | 173 delegate, |
| 173 cmd_line, | 174 cmd_line, |
| 174 data_.id, | 175 data_.id, |
| 175 this, | 176 this, |
| 176 terminate_on_shutdown)); | 177 terminate_on_shutdown)); |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 | 389 |
| 389 #if defined(OS_WIN) | 390 #if defined(OS_WIN) |
| 390 | 391 |
| 391 void BrowserChildProcessHostImpl::OnObjectSignaled(HANDLE object) { | 392 void BrowserChildProcessHostImpl::OnObjectSignaled(HANDLE object) { |
| 392 OnChildDisconnected(); | 393 OnChildDisconnected(); |
| 393 } | 394 } |
| 394 | 395 |
| 395 #endif | 396 #endif |
| 396 | 397 |
| 397 } // namespace content | 398 } // namespace content |
| OLD | NEW |