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/ppapi_plugin_process_host.h" | 5 #include "content/browser/ppapi_plugin_process_host.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/base_switches.h" | 9 #include "base/base_switches.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 switches::kVModule | 160 switches::kVModule |
161 }; | 161 }; |
162 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches, | 162 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches, |
163 arraysize(kCommonForwardSwitches)); | 163 arraysize(kCommonForwardSwitches)); |
164 | 164 |
165 if (!is_broker_) { | 165 if (!is_broker_) { |
166 // TODO(vtl): Stop passing flash args in the command line, on windows is | 166 // TODO(vtl): Stop passing flash args in the command line, on windows is |
167 // going to explode. | 167 // going to explode. |
168 static const char* kPluginForwardSwitches[] = { | 168 static const char* kPluginForwardSwitches[] = { |
169 switches::kNoSandbox, | 169 switches::kNoSandbox, |
| 170 switches::kDisableSeccompFilterSandbox, |
170 switches::kPpapiFlashArgs, | 171 switches::kPpapiFlashArgs, |
171 switches::kPpapiStartupDialog | 172 switches::kPpapiStartupDialog |
172 }; | 173 }; |
173 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches, | 174 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches, |
174 arraysize(kPluginForwardSwitches)); | 175 arraysize(kPluginForwardSwitches)); |
175 } | 176 } |
176 | 177 |
177 if (!plugin_launcher.empty()) | 178 if (!plugin_launcher.empty()) |
178 cmd_line->PrependWrapper(plugin_launcher); | 179 cmd_line->PrependWrapper(plugin_launcher); |
179 | 180 |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
291 renderer_process, &renderers_plugin_handle, | 292 renderer_process, &renderers_plugin_handle, |
292 0, FALSE, DUPLICATE_SAME_ACCESS); | 293 0, FALSE, DUPLICATE_SAME_ACCESS); |
293 #elif defined(OS_POSIX) | 294 #elif defined(OS_POSIX) |
294 // Don't need to duplicate anything on POSIX since it's just a PID. | 295 // Don't need to duplicate anything on POSIX since it's just a PID. |
295 base::ProcessHandle renderers_plugin_handle = plugin_process; | 296 base::ProcessHandle renderers_plugin_handle = plugin_process; |
296 #endif | 297 #endif |
297 | 298 |
298 client->OnPpapiChannelOpened(renderers_plugin_handle, channel_handle, | 299 client->OnPpapiChannelOpened(renderers_plugin_handle, channel_handle, |
299 process_->GetData().id); | 300 process_->GetData().id); |
300 } | 301 } |
OLD | NEW |