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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 #if defined(OS_WIN) | 152 #if defined(OS_WIN) |
153 switches::kDisableDesktopNotifications, | 153 switches::kDisableDesktopNotifications, |
154 #endif | 154 #endif |
155 switches::kDisableFileSystem, | 155 switches::kDisableFileSystem, |
156 switches::kDisableSeccompFilterSandbox, | 156 switches::kDisableSeccompFilterSandbox, |
157 switches::kEnableExperimentalWebPlatformFeatures, | 157 switches::kEnableExperimentalWebPlatformFeatures, |
158 switches::kEnableServiceWorker, | 158 switches::kEnableServiceWorker, |
159 #if defined(OS_MACOSX) | 159 #if defined(OS_MACOSX) |
160 switches::kEnableSandboxLogging, | 160 switches::kEnableSandboxLogging, |
161 #endif | 161 #endif |
162 switches::kJavaScriptFlags | 162 switches::kJavaScriptFlags, |
| 163 switches::kNoSandbox |
163 }; | 164 }; |
164 cmd_line->CopySwitchesFrom(*CommandLine::ForCurrentProcess(), kSwitchNames, | 165 cmd_line->CopySwitchesFrom(*CommandLine::ForCurrentProcess(), kSwitchNames, |
165 arraysize(kSwitchNames)); | 166 arraysize(kSwitchNames)); |
166 | 167 |
167 #if defined(OS_POSIX) | 168 #if defined(OS_POSIX) |
168 bool use_zygote = true; | 169 bool use_zygote = true; |
169 | 170 |
170 if (CommandLine::ForCurrentProcess()->HasSwitch( | 171 if (CommandLine::ForCurrentProcess()->HasSwitch( |
171 switches::kWaitForDebuggerChildren)) { | 172 switches::kWaitForDebuggerChildren)) { |
172 // Look to pass-on the kWaitForDebugger flag. | 173 // Look to pass-on the kWaitForDebugger flag. |
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
703 return false; | 704 return false; |
704 } | 705 } |
705 | 706 |
706 WorkerProcessHost::WorkerInstance::FilterInfo | 707 WorkerProcessHost::WorkerInstance::FilterInfo |
707 WorkerProcessHost::WorkerInstance::GetFilter() const { | 708 WorkerProcessHost::WorkerInstance::GetFilter() const { |
708 DCHECK(NumFilters() == 1); | 709 DCHECK(NumFilters() == 1); |
709 return *filters_.begin(); | 710 return *filters_.begin(); |
710 } | 711 } |
711 | 712 |
712 } // namespace content | 713 } // namespace content |
OLD | NEW |