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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 use_zygote = false; | 208 use_zygote = false; |
209 } | 209 } |
210 } | 210 } |
211 #endif | 211 #endif |
212 | 212 |
213 process_->Launch( | 213 process_->Launch( |
214 #if defined(OS_WIN) | 214 #if defined(OS_WIN) |
215 new WorkerSandboxedProcessLauncherDelegate, | 215 new WorkerSandboxedProcessLauncherDelegate, |
216 #elif defined(OS_POSIX) | 216 #elif defined(OS_POSIX) |
217 use_zygote, | 217 use_zygote, |
218 base::EnvironmentVector(), | 218 base::EnvironmentMap(), |
219 #endif | 219 #endif |
220 cmd_line); | 220 cmd_line); |
221 | 221 |
222 ChildProcessSecurityPolicyImpl::GetInstance()->AddWorker( | 222 ChildProcessSecurityPolicyImpl::GetInstance()->AddWorker( |
223 process_->GetData().id, render_process_id); | 223 process_->GetData().id, render_process_id); |
224 CreateMessageFilters(render_process_id); | 224 CreateMessageFilters(render_process_id); |
225 | 225 |
226 return true; | 226 return true; |
227 } | 227 } |
228 | 228 |
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
718 return false; | 718 return false; |
719 } | 719 } |
720 | 720 |
721 WorkerProcessHost::WorkerInstance::FilterInfo | 721 WorkerProcessHost::WorkerInstance::FilterInfo |
722 WorkerProcessHost::WorkerInstance::GetFilter() const { | 722 WorkerProcessHost::WorkerInstance::GetFilter() const { |
723 DCHECK(NumFilters() == 1); | 723 DCHECK(NumFilters() == 1); |
724 return *filters_.begin(); | 724 return *filters_.begin(); |
725 } | 725 } |
726 | 726 |
727 } // namespace content | 727 } // namespace content |
OLD | NEW |