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/worker_host/worker_process_host.h" | 5 #include "content/browser/worker_host/worker_process_host.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 // optional commands from gdb_chrome file in the working directory. | 216 // optional commands from gdb_chrome file in the working directory. |
217 cmd_line->PrependWrapper("xterm -e gdb -x gdb_chrome --args"); | 217 cmd_line->PrependWrapper("xterm -e gdb -x gdb_chrome --args"); |
218 use_zygote = false; | 218 use_zygote = false; |
219 } | 219 } |
220 } | 220 } |
221 #endif | 221 #endif |
222 | 222 |
223 process_->Launch( | 223 process_->Launch( |
224 #if defined(OS_WIN) | 224 #if defined(OS_WIN) |
225 new WorkerSandboxedProcessLauncherDelegate, | 225 new WorkerSandboxedProcessLauncherDelegate, |
| 226 false, |
226 #elif defined(OS_POSIX) | 227 #elif defined(OS_POSIX) |
227 use_zygote, | 228 use_zygote, |
228 base::EnvironmentMap(), | 229 base::EnvironmentMap(), |
229 #endif | 230 #endif |
230 cmd_line); | 231 cmd_line); |
231 | 232 |
232 ChildProcessSecurityPolicyImpl::GetInstance()->AddWorker( | 233 ChildProcessSecurityPolicyImpl::GetInstance()->AddWorker( |
233 process_->GetData().id, render_process_id); | 234 process_->GetData().id, render_process_id); |
234 CreateMessageFilters(render_process_id); | 235 CreateMessageFilters(render_process_id); |
235 | 236 |
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
807 return false; | 808 return false; |
808 } | 809 } |
809 | 810 |
810 WorkerProcessHost::WorkerInstance::FilterInfo | 811 WorkerProcessHost::WorkerInstance::FilterInfo |
811 WorkerProcessHost::WorkerInstance::GetFilter() const { | 812 WorkerProcessHost::WorkerInstance::GetFilter() const { |
812 DCHECK(NumFilters() == 1); | 813 DCHECK(NumFilters() == 1); |
813 return *filters_.begin(); | 814 return *filters_.begin(); |
814 } | 815 } |
815 | 816 |
816 } // namespace content | 817 } // namespace content |
OLD | NEW |