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

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

Issue 11659032: Enable Pepper threading on all channels. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 11 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
« no previous file with comments | « chrome/test/ppapi/ppapi_test.cc ('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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 }; 234 };
235 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches, 235 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches,
236 arraysize(kCommonForwardSwitches)); 236 arraysize(kCommonForwardSwitches));
237 237
238 if (!is_broker_) { 238 if (!is_broker_) {
239 // TODO(vtl): Stop passing flash args in the command line, on windows is 239 // TODO(vtl): Stop passing flash args in the command line, on windows is
240 // going to explode. 240 // going to explode.
241 static const char* kPluginForwardSwitches[] = { 241 static const char* kPluginForwardSwitches[] = {
242 switches::kDisablePepperThreading, 242 switches::kDisablePepperThreading,
243 switches::kDisableSeccompFilterSandbox, 243 switches::kDisableSeccompFilterSandbox,
244 switches::kEnablePepperThreading,
245 #if defined(OS_MACOSX) 244 #if defined(OS_MACOSX)
246 switches::kEnableSandboxLogging, 245 switches::kEnableSandboxLogging,
247 #endif 246 #endif
248 switches::kNoSandbox, 247 switches::kNoSandbox,
249 switches::kPpapiFlashArgs, 248 switches::kPpapiFlashArgs,
250 switches::kPpapiStartupDialog, 249 switches::kPpapiStartupDialog,
251 }; 250 };
252 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches, 251 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches,
253 arraysize(kPluginForwardSwitches)); 252 arraysize(kPluginForwardSwitches));
254 } 253 }
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 // sent_requests_ queue should be the one that the plugin just created. 369 // sent_requests_ queue should be the one that the plugin just created.
371 Client* client = sent_requests_.front(); 370 Client* client = sent_requests_.front();
372 sent_requests_.pop(); 371 sent_requests_.pop();
373 372
374 const ChildProcessData& data = process_->GetData(); 373 const ChildProcessData& data = process_->GetData();
375 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle), 374 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle),
376 data.id); 375 data.id);
377 } 376 }
378 377
379 } // namespace content 378 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/ppapi/ppapi_test.cc ('k') | content/ppapi_plugin/ppapi_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698