| 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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); | 266 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); |
| 267 | 267 |
| 268 // These switches are forwarded to both plugin and broker pocesses. | 268 // These switches are forwarded to both plugin and broker pocesses. |
| 269 static const char* kCommonForwardSwitches[] = { | 269 static const char* kCommonForwardSwitches[] = { |
| 270 switches::kVModule | 270 switches::kVModule |
| 271 }; | 271 }; |
| 272 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches, | 272 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches, |
| 273 arraysize(kCommonForwardSwitches)); | 273 arraysize(kCommonForwardSwitches)); |
| 274 | 274 |
| 275 if (!is_broker_) { | 275 if (!is_broker_) { |
| 276 // TODO(vtl): Stop passing flash args in the command line, or windows is | 276 // TODO(vtl): Stop passing flash args in the command line, on windows is |
| 277 // going to explode. | 277 // going to explode. |
| 278 static const char* kPluginForwardSwitches[] = { | 278 static const char* kPluginForwardSwitches[] = { |
| 279 switches::kDisablePepperThreading, |
| 279 switches::kDisableSeccompFilterSandbox, | 280 switches::kDisableSeccompFilterSandbox, |
| 280 #if defined(OS_MACOSX) | 281 #if defined(OS_MACOSX) |
| 281 switches::kEnableSandboxLogging, | 282 switches::kEnableSandboxLogging, |
| 282 #endif | 283 #endif |
| 283 switches::kNoSandbox, | 284 switches::kNoSandbox, |
| 284 switches::kPpapiFlashArgs, | 285 switches::kPpapiFlashArgs, |
| 285 switches::kPpapiStartupDialog, | 286 switches::kPpapiStartupDialog, |
| 286 }; | 287 }; |
| 287 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches, | 288 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches, |
| 288 arraysize(kPluginForwardSwitches)); | 289 arraysize(kPluginForwardSwitches)); |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 // sent_requests_ queue should be the one that the plugin just created. | 408 // sent_requests_ queue should be the one that the plugin just created. |
| 408 Client* client = sent_requests_.front(); | 409 Client* client = sent_requests_.front(); |
| 409 sent_requests_.pop(); | 410 sent_requests_.pop(); |
| 410 | 411 |
| 411 const ChildProcessData& data = process_->GetData(); | 412 const ChildProcessData& data = process_->GetData(); |
| 412 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle), | 413 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle), |
| 413 data.id); | 414 data.id); |
| 414 } | 415 } |
| 415 | 416 |
| 416 } // namespace content | 417 } // namespace content |
| OLD | NEW |