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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
279 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); | 279 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); |
280 | 280 |
281 // These switches are forwarded to both plugin and broker pocesses. | 281 // These switches are forwarded to both plugin and broker pocesses. |
282 static const char* kCommonForwardSwitches[] = { | 282 static const char* kCommonForwardSwitches[] = { |
283 switches::kVModule | 283 switches::kVModule |
284 }; | 284 }; |
285 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches, | 285 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches, |
286 arraysize(kCommonForwardSwitches)); | 286 arraysize(kCommonForwardSwitches)); |
287 | 287 |
288 if (!is_broker_) { | 288 if (!is_broker_) { |
289 // TODO(vtl): Stop passing flash args in the command line, or windows is | 289 // TODO(vtl): Stop passing flash args in the command line, on windows is |
290 // going to explode. | 290 // going to explode. |
291 static const char* kPluginForwardSwitches[] = { | 291 static const char* kPluginForwardSwitches[] = { |
| 292 switches::kDisablePepperThreading, |
292 switches::kDisableSeccompFilterSandbox, | 293 switches::kDisableSeccompFilterSandbox, |
293 #if defined(OS_MACOSX) | 294 #if defined(OS_MACOSX) |
294 switches::kEnableSandboxLogging, | 295 switches::kEnableSandboxLogging, |
295 #endif | 296 #endif |
296 switches::kNoSandbox, | 297 switches::kNoSandbox, |
297 switches::kPpapiFlashArgs, | 298 switches::kPpapiFlashArgs, |
298 switches::kPpapiStartupDialog, | 299 switches::kPpapiStartupDialog, |
299 }; | 300 }; |
300 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches, | 301 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches, |
301 arraysize(kPluginForwardSwitches)); | 302 arraysize(kPluginForwardSwitches)); |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
420 // sent_requests_ queue should be the one that the plugin just created. | 421 // sent_requests_ queue should be the one that the plugin just created. |
421 Client* client = sent_requests_.front(); | 422 Client* client = sent_requests_.front(); |
422 sent_requests_.pop(); | 423 sent_requests_.pop(); |
423 | 424 |
424 const ChildProcessData& data = process_->GetData(); | 425 const ChildProcessData& data = process_->GetData(); |
425 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle), | 426 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle), |
426 data.id); | 427 data.id); |
427 } | 428 } |
428 | 429 |
429 } // namespace content | 430 } // namespace content |
OLD | NEW |