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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 CommandLine* cmd_line) { | 133 CommandLine* cmd_line) { |
134 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 134 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
135 | 135 |
136 GetContentClient()->browser()->AppendExtraCommandLineSwitches( | 136 GetContentClient()->browser()->AppendExtraCommandLineSwitches( |
137 cmd_line, data_.id); | 137 cmd_line, data_.id); |
138 | 138 |
139 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); | 139 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); |
140 static const char* kForwardSwitches[] = { | 140 static const char* kForwardSwitches[] = { |
141 switches::kDisableLogging, | 141 switches::kDisableLogging, |
142 switches::kEnableLogging, | 142 switches::kEnableLogging, |
| 143 switches::kIPCConnectionTimeout, |
143 switches::kLoggingLevel, | 144 switches::kLoggingLevel, |
144 switches::kTraceToConsole, | 145 switches::kTraceToConsole, |
145 switches::kV, | 146 switches::kV, |
146 switches::kVModule, | 147 switches::kVModule, |
147 #if defined(OS_WIN) | 148 #if defined(OS_WIN) |
148 switches::kEnableHighResolutionTime, | 149 switches::kEnableHighResolutionTime, |
149 #endif | 150 #endif |
150 }; | 151 }; |
151 cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches, | 152 cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches, |
152 arraysize(kForwardSwitches)); | 153 arraysize(kForwardSwitches)); |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
358 | 359 |
359 void BrowserChildProcessHostImpl::OnProcessExitedEarly( | 360 void BrowserChildProcessHostImpl::OnProcessExitedEarly( |
360 base::WaitableEvent* event) { | 361 base::WaitableEvent* event) { |
361 DeleteProcessWaitableEvent(event); | 362 DeleteProcessWaitableEvent(event); |
362 OnChildDisconnected(); | 363 OnChildDisconnected(); |
363 } | 364 } |
364 | 365 |
365 #endif | 366 #endif |
366 | 367 |
367 } // namespace content | 368 } // namespace content |
OLD | NEW |