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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 // optional commands from gdb_chrome file in the working directory. | 184 // optional commands from gdb_chrome file in the working directory. |
185 cmd_line->PrependWrapper("xterm -e gdb -x gdb_chrome --args"); | 185 cmd_line->PrependWrapper("xterm -e gdb -x gdb_chrome --args"); |
186 use_zygote = false; | 186 use_zygote = false; |
187 } | 187 } |
188 } | 188 } |
189 #endif | 189 #endif |
190 | 190 |
191 process_->Launch( | 191 process_->Launch( |
192 #if defined(OS_WIN) | 192 #if defined(OS_WIN) |
193 new WorkerSandboxedProcessLauncherDelegate, | 193 new WorkerSandboxedProcessLauncherDelegate, |
| 194 false, |
194 #elif defined(OS_POSIX) | 195 #elif defined(OS_POSIX) |
195 use_zygote, | 196 use_zygote, |
196 base::EnvironmentMap(), | 197 base::EnvironmentMap(), |
197 #endif | 198 #endif |
198 cmd_line); | 199 cmd_line); |
199 | 200 |
200 ChildProcessSecurityPolicyImpl::GetInstance()->AddWorker( | 201 ChildProcessSecurityPolicyImpl::GetInstance()->AddWorker( |
201 process_->GetData().id, render_process_id); | 202 process_->GetData().id, render_process_id); |
202 CreateMessageFilters(render_process_id); | 203 CreateMessageFilters(render_process_id); |
203 | 204 |
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
689 return false; | 690 return false; |
690 } | 691 } |
691 | 692 |
692 WorkerProcessHost::WorkerInstance::FilterInfo | 693 WorkerProcessHost::WorkerInstance::FilterInfo |
693 WorkerProcessHost::WorkerInstance::GetFilter() const { | 694 WorkerProcessHost::WorkerInstance::GetFilter() const { |
694 DCHECK(NumFilters() == 1); | 695 DCHECK(NumFilters() == 1); |
695 return *filters_.begin(); | 696 return *filters_.begin(); |
696 } | 697 } |
697 | 698 |
698 } // namespace content | 699 } // namespace content |
OLD | NEW |