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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 it != copy.end(); ++it) { | 126 it != copy.end(); ++it) { |
127 delete (*it)->delegate(); // ~*HostDelegate deletes *HostImpl. | 127 delete (*it)->delegate(); // ~*HostDelegate deletes *HostImpl. |
128 } | 128 } |
129 } | 129 } |
130 | 130 |
131 void BrowserChildProcessHostImpl::Launch( | 131 void BrowserChildProcessHostImpl::Launch( |
132 #if defined(OS_WIN) | 132 #if defined(OS_WIN) |
133 SandboxedProcessLauncherDelegate* delegate, | 133 SandboxedProcessLauncherDelegate* delegate, |
134 #elif defined(OS_POSIX) | 134 #elif defined(OS_POSIX) |
135 bool use_zygote, | 135 bool use_zygote, |
136 const base::EnvironmentVector& environ, | 136 const base::EnvironmentMap& environ, |
137 #endif | 137 #endif |
138 CommandLine* cmd_line) { | 138 CommandLine* cmd_line) { |
139 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 139 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
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, |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
345 | 345 |
346 void BrowserChildProcessHostImpl::OnProcessExitedEarly( | 346 void BrowserChildProcessHostImpl::OnProcessExitedEarly( |
347 base::WaitableEvent* event) { | 347 base::WaitableEvent* event) { |
348 DeleteProcessWaitableEvent(event); | 348 DeleteProcessWaitableEvent(event); |
349 OnChildDisconnected(); | 349 OnChildDisconnected(); |
350 } | 350 } |
351 | 351 |
352 #endif | 352 #endif |
353 | 353 |
354 } // namespace content | 354 } // namespace content |
OLD | NEW |