| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); | 395 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); |
| 396 | 396 |
| 397 #if defined(OS_WIN) | 397 #if defined(OS_WIN) |
| 398 if (GetContentClient()->browser()->ShouldUseWindowsPrefetchArgument()) { | 398 if (GetContentClient()->browser()->ShouldUseWindowsPrefetchArgument()) { |
| 399 cmd_line->AppendArg(is_broker_ ? switches::kPrefetchArgumentPpapiBroker | 399 cmd_line->AppendArg(is_broker_ ? switches::kPrefetchArgumentPpapiBroker |
| 400 : switches::kPrefetchArgumentPpapi); | 400 : switches::kPrefetchArgumentPpapi); |
| 401 } | 401 } |
| 402 #endif // defined(OS_WIN) | 402 #endif // defined(OS_WIN) |
| 403 | 403 |
| 404 // These switches are forwarded to both plugin and broker pocesses. | 404 // These switches are forwarded to both plugin and broker pocesses. |
| 405 static const char* kCommonForwardSwitches[] = { | 405 static const char* const kCommonForwardSwitches[] = { |
| 406 switches::kVModule | 406 switches::kVModule |
| 407 }; | 407 }; |
| 408 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches, | 408 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches, |
| 409 arraysize(kCommonForwardSwitches)); | 409 arraysize(kCommonForwardSwitches)); |
| 410 | 410 |
| 411 if (!is_broker_) { | 411 if (!is_broker_) { |
| 412 static const char* kPluginForwardSwitches[] = { | 412 static const char* const kPluginForwardSwitches[] = { |
| 413 switches::kDisableSeccompFilterSandbox, | 413 switches::kDisableSeccompFilterSandbox, |
| 414 #if defined(OS_MACOSX) | 414 #if defined(OS_MACOSX) |
| 415 switches::kEnableSandboxLogging, | 415 switches::kEnableSandboxLogging, |
| 416 #endif | 416 #endif |
| 417 switches::kNoSandbox, | 417 switches::kNoSandbox, |
| 418 switches::kPpapiStartupDialog, | 418 switches::kPpapiStartupDialog, |
| 419 }; | 419 }; |
| 420 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches, | 420 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches, |
| 421 arraysize(kPluginForwardSwitches)); | 421 arraysize(kPluginForwardSwitches)); |
| 422 | 422 |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 546 // sent_requests_ queue should be the one that the plugin just created. | 546 // sent_requests_ queue should be the one that the plugin just created. |
| 547 Client* client = sent_requests_.front(); | 547 Client* client = sent_requests_.front(); |
| 548 sent_requests_.pop(); | 548 sent_requests_.pop(); |
| 549 | 549 |
| 550 const ChildProcessData& data = process_->GetData(); | 550 const ChildProcessData& data = process_->GetData(); |
| 551 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle), | 551 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle), |
| 552 data.id); | 552 data.id); |
| 553 } | 553 } |
| 554 | 554 |
| 555 } // namespace content | 555 } // namespace content |
| OLD | NEW |