Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: trunk/src/content/browser/ppapi_plugin_process_host.cc

Issue 13328006: Revert 191420 "PPAPI: Remove threading options; it's always on" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/build/common.gypi ('k') | trunk/src/content/ppapi_plugin/ppapi_thread.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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
OLDNEW
« no previous file with comments | « trunk/src/build/common.gypi ('k') | trunk/src/content/ppapi_plugin/ppapi_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698