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

Unified Diff: components/nacl/browser/nacl_process_host.cc

Issue 112343005: Pepper: Finish support for dev channel APIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes for dmichael Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/ppapi_plugin_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/browser/nacl_process_host.cc
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc
index 2d154f38d986a846756618da10884de75f8dd870..a5a4cfe96fdffb0bb0afc7f1b84681e840135cb2 100644
--- a/components/nacl/browser/nacl_process_host.cc
+++ b/components/nacl/browser/nacl_process_host.cc
@@ -196,6 +196,8 @@ ppapi::PpapiPermissions GetNaClPermissions(uint32 permission_bits) {
// a compromised renderer to be able to start a nacl plugin with e.g. Flash
// permissions which may expand the surface area of the sandbox.
uint32 masked_bits = permission_bits & ppapi::PERMISSION_DEV;
+ if (content::PluginService::GetInstance()->PpapiDevChannelSupported())
+ masked_bits |= ppapi::PERMISSION_DEV_CHANNEL;
return ppapi::PpapiPermissions::GetForCommandLine(masked_bits);
}
@@ -803,8 +805,6 @@ void NaClProcessHost::OnPpapiChannelCreated(
ppapi::PpapiNaClChannelArgs args;
args.off_the_record = nacl_host_message_filter_->off_the_record();
args.permissions = permissions_;
- args.supports_dev_channel =
- content::PluginService::GetInstance()->PpapiDevChannelSupported();
CommandLine* cmdline = CommandLine::ForCurrentProcess();
DCHECK(cmdline);
std::string flag_whitelist[] = {switches::kV, switches::kVModule};
« no previous file with comments | « no previous file | content/browser/ppapi_plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698