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

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

Issue 12476028: Revert 187340 "PPAPI: Remove threading options; it's always on" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 9 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 | « build/common.gypi ('k') | 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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); 241 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
242 242
243 // These switches are forwarded to both plugin and broker pocesses. 243 // These switches are forwarded to both plugin and broker pocesses.
244 static const char* kCommonForwardSwitches[] = { 244 static const char* kCommonForwardSwitches[] = {
245 switches::kVModule 245 switches::kVModule
246 }; 246 };
247 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches, 247 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches,
248 arraysize(kCommonForwardSwitches)); 248 arraysize(kCommonForwardSwitches));
249 249
250 if (!is_broker_) { 250 if (!is_broker_) {
251 // TODO(vtl): Stop passing flash args in the command line, or windows is 251 // TODO(vtl): Stop passing flash args in the command line, on windows is
252 // going to explode. 252 // going to explode.
253 static const char* kPluginForwardSwitches[] = { 253 static const char* kPluginForwardSwitches[] = {
254 switches::kDisablePepperThreading,
254 switches::kDisableSeccompFilterSandbox, 255 switches::kDisableSeccompFilterSandbox,
255 #if defined(OS_MACOSX) 256 #if defined(OS_MACOSX)
256 switches::kEnableSandboxLogging, 257 switches::kEnableSandboxLogging,
257 #endif 258 #endif
258 switches::kNoSandbox, 259 switches::kNoSandbox,
259 switches::kPpapiFlashArgs, 260 switches::kPpapiFlashArgs,
260 switches::kPpapiStartupDialog, 261 switches::kPpapiStartupDialog,
261 }; 262 };
262 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches, 263 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches,
263 arraysize(kPluginForwardSwitches)); 264 arraysize(kPluginForwardSwitches));
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 // sent_requests_ queue should be the one that the plugin just created. 383 // sent_requests_ queue should be the one that the plugin just created.
383 Client* client = sent_requests_.front(); 384 Client* client = sent_requests_.front();
384 sent_requests_.pop(); 385 sent_requests_.pop();
385 386
386 const ChildProcessData& data = process_->GetData(); 387 const ChildProcessData& data = process_->GetData();
387 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle), 388 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle),
388 data.id); 389 data.id);
389 } 390 }
390 391
391 } // namespace content 392 } // namespace content
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | content/ppapi_plugin/ppapi_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698