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

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

Issue 11419260: Enable Pepper threading on canary. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years 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/common/chrome_content_client.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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 static const char* kCommonForwardSwitches[] = { 229 static const char* kCommonForwardSwitches[] = {
230 switches::kVModule 230 switches::kVModule
231 }; 231 };
232 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches, 232 cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches,
233 arraysize(kCommonForwardSwitches)); 233 arraysize(kCommonForwardSwitches));
234 234
235 if (!is_broker_) { 235 if (!is_broker_) {
236 // TODO(vtl): Stop passing flash args in the command line, on windows is 236 // TODO(vtl): Stop passing flash args in the command line, on windows is
237 // going to explode. 237 // going to explode.
238 static const char* kPluginForwardSwitches[] = { 238 static const char* kPluginForwardSwitches[] = {
239 switches::kDisablePepperThreading,
239 switches::kDisableSeccompFilterSandbox, 240 switches::kDisableSeccompFilterSandbox,
240 switches::kEnablePepperThreading, 241 switches::kEnablePepperThreading,
241 #if defined(OS_MACOSX) 242 #if defined(OS_MACOSX)
242 switches::kEnableSandboxLogging, 243 switches::kEnableSandboxLogging,
243 #endif 244 #endif
244 switches::kNoSandbox, 245 switches::kNoSandbox,
245 switches::kPpapiFlashArgs, 246 switches::kPpapiFlashArgs,
246 switches::kPpapiStartupDialog, 247 switches::kPpapiStartupDialog,
247 }; 248 };
248 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches, 249 cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches,
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 362
362 // All requests should be processed FIFO, so the next item in the 363 // All requests should be processed FIFO, so the next item in the
363 // sent_requests_ queue should be the one that the plugin just created. 364 // sent_requests_ queue should be the one that the plugin just created.
364 Client* client = sent_requests_.front(); 365 Client* client = sent_requests_.front();
365 sent_requests_.pop(); 366 sent_requests_.pop();
366 367
367 client->OnPpapiChannelOpened(channel_handle, process_->GetData().id); 368 client->OnPpapiChannelOpened(channel_handle, process_->GetData().id);
368 } 369 }
369 370
370 } // namespace content 371 } // namespace content
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | content/ppapi_plugin/ppapi_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698