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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 // list. | 123 // list. |
124 BrowserChildProcessList copy = g_child_process_list.Get(); | 124 BrowserChildProcessList copy = g_child_process_list.Get(); |
125 for (BrowserChildProcessList::iterator it = copy.begin(); | 125 for (BrowserChildProcessList::iterator it = copy.begin(); |
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 const base::FilePath& exposed_dir, | 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::EnvironmentVector& 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 #if defined(OS_POSIX) | |
147 switches::kChildCleanExit, | |
148 #endif | |
149 switches::kDisableLogging, | 146 switches::kDisableLogging, |
150 switches::kEnableDCHECK, | 147 switches::kEnableDCHECK, |
151 switches::kEnableLogging, | 148 switches::kEnableLogging, |
152 switches::kLoggingLevel, | 149 switches::kLoggingLevel, |
153 switches::kV, | 150 switches::kV, |
154 switches::kVModule, | 151 switches::kVModule, |
| 152 #if defined(OS_POSIX) |
| 153 switches::kChildCleanExit, |
| 154 #endif |
155 }; | 155 }; |
156 cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches, | 156 cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches, |
157 arraysize(kForwardSwitches)); | 157 arraysize(kForwardSwitches)); |
158 | 158 |
159 child_process_.reset(new ChildProcessLauncher( | 159 child_process_.reset(new ChildProcessLauncher( |
160 #if defined(OS_WIN) | 160 #if defined(OS_WIN) |
161 exposed_dir, | 161 delegate, |
162 #elif defined(OS_POSIX) | 162 #elif defined(OS_POSIX) |
163 use_zygote, | 163 use_zygote, |
164 environ, | 164 environ, |
165 child_process_host_->TakeClientFileDescriptor(), | 165 child_process_host_->TakeClientFileDescriptor(), |
166 #endif | 166 #endif |
167 cmd_line, | 167 cmd_line, |
168 data_.id, | 168 data_.id, |
169 this)); | 169 this)); |
170 } | 170 } |
171 | 171 |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
336 | 336 |
337 void BrowserChildProcessHostImpl::OnProcessExitedEarly( | 337 void BrowserChildProcessHostImpl::OnProcessExitedEarly( |
338 base::WaitableEvent* event) { | 338 base::WaitableEvent* event) { |
339 DeleteProcessWaitableEvent(event); | 339 DeleteProcessWaitableEvent(event); |
340 OnChildDisconnected(); | 340 OnChildDisconnected(); |
341 } | 341 } |
342 | 342 |
343 #endif | 343 #endif |
344 | 344 |
345 } // namespace content | 345 } // namespace content |
OLD | NEW |