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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 static const char* kCommonForwardSwitches[] = { | 228 static const char* kCommonForwardSwitches[] = { |
229 switches::kVModule | 229 switches::kVModule |
230 }; | 230 }; |
231 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches, | 231 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches, |
232 arraysize(kCommonForwardSwitches)); | 232 arraysize(kCommonForwardSwitches)); |
233 | 233 |
234 if (!is_broker_) { | 234 if (!is_broker_) { |
235 // TODO(vtl): Stop passing flash args in the command line, on windows is | 235 // TODO(vtl): Stop passing flash args in the command line, on windows is |
236 // going to explode. | 236 // going to explode. |
237 static const char* kPluginForwardSwitches[] = { | 237 static const char* kPluginForwardSwitches[] = { |
| 238 switches::kDisableSeccompFilterSandbox, |
| 239 #if defined(OS_MACOSX) |
| 240 switches::kEnableSandboxLogging, |
| 241 #endif |
238 switches::kNoSandbox, | 242 switches::kNoSandbox, |
239 switches::kDisableSeccompFilterSandbox, | |
240 switches::kPpapiFlashArgs, | 243 switches::kPpapiFlashArgs, |
241 switches::kPpapiStartupDialog | 244 switches::kPpapiStartupDialog, |
242 }; | 245 }; |
243 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches, | 246 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches, |
244 arraysize(kPluginForwardSwitches)); | 247 arraysize(kPluginForwardSwitches)); |
245 } | 248 } |
246 | 249 |
247 std::string locale = | 250 std::string locale = |
248 content::GetContentClient()->browser()->GetApplicationLocale(); | 251 content::GetContentClient()->browser()->GetApplicationLocale(); |
249 if (!locale.empty()) { | 252 if (!locale.empty()) { |
250 // Pass on the locale so the plugin will know what language we're using. | 253 // Pass on the locale so the plugin will know what language we're using. |
251 cmd_line->AppendSwitchASCII(switches::kLang, locale); | 254 cmd_line->AppendSwitchASCII(switches::kLang, locale); |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
355 if (sent_requests_.empty()) | 358 if (sent_requests_.empty()) |
356 return; | 359 return; |
357 | 360 |
358 // All requests should be processed FIFO, so the next item in the | 361 // All requests should be processed FIFO, so the next item in the |
359 // sent_requests_ queue should be the one that the plugin just created. | 362 // sent_requests_ queue should be the one that the plugin just created. |
360 Client* client = sent_requests_.front(); | 363 Client* client = sent_requests_.front(); |
361 sent_requests_.pop(); | 364 sent_requests_.pop(); |
362 | 365 |
363 client->OnPpapiChannelOpened(channel_handle, process_->GetData().id); | 366 client->OnPpapiChannelOpened(channel_handle, process_->GetData().id); |
364 } | 367 } |
OLD | NEW |