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 <vector> | 9 #include <vector> |
9 | 10 |
10 #include "base/base_switches.h" | 11 #include "base/base_switches.h" |
11 #include "base/bind.h" | 12 #include "base/bind.h" |
12 #include "base/bind_helpers.h" | 13 #include "base/bind_helpers.h" |
13 #include "base/callback.h" | 14 #include "base/callback.h" |
14 #include "base/command_line.h" | 15 #include "base/command_line.h" |
15 #include "base/message_loop.h" | 16 #include "base/message_loop.h" |
16 #include "base/string_util.h" | 17 #include "base/string_util.h" |
17 #include "base/utf_string_conversions.h" | 18 #include "base/utf_string_conversions.h" |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 use_zygote = false; | 184 use_zygote = false; |
184 } | 185 } |
185 } | 186 } |
186 #endif | 187 #endif |
187 | 188 |
188 process_->Launch( | 189 process_->Launch( |
189 #if defined(OS_WIN) | 190 #if defined(OS_WIN) |
190 FilePath(), | 191 FilePath(), |
191 #elif defined(OS_POSIX) | 192 #elif defined(OS_POSIX) |
192 use_zygote, | 193 use_zygote, |
193 base::environment_vector(), | 194 base::EnvironmentVector(), |
194 #endif | 195 #endif |
195 cmd_line); | 196 cmd_line); |
196 | 197 |
197 ChildProcessSecurityPolicyImpl::GetInstance()->AddWorker( | 198 ChildProcessSecurityPolicyImpl::GetInstance()->AddWorker( |
198 process_->GetData().id, render_process_id); | 199 process_->GetData().id, render_process_id); |
199 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 200 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
200 switches::kDisableFileSystem)) { | 201 switches::kDisableFileSystem)) { |
201 // Grant most file permissions to this worker. | 202 // Grant most file permissions to this worker. |
202 // PLATFORM_FILE_TEMPORARY, PLATFORM_FILE_HIDDEN and | 203 // PLATFORM_FILE_TEMPORARY, PLATFORM_FILE_HIDDEN and |
203 // PLATFORM_FILE_DELETE_ON_CLOSE are not granted, because no existing API | 204 // PLATFORM_FILE_DELETE_ON_CLOSE are not granted, because no existing API |
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
665 } | 666 } |
666 } | 667 } |
667 return false; | 668 return false; |
668 } | 669 } |
669 | 670 |
670 WorkerProcessHost::WorkerInstance::FilterInfo | 671 WorkerProcessHost::WorkerInstance::FilterInfo |
671 WorkerProcessHost::WorkerInstance::GetFilter() const { | 672 WorkerProcessHost::WorkerInstance::GetFilter() const { |
672 DCHECK(NumFilters() == 1); | 673 DCHECK(NumFilters() == 1); |
673 return *filters_.begin(); | 674 return *filters_.begin(); |
674 } | 675 } |
OLD | NEW |