diff options
| author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 17:10:50 +0000 |
|---|---|---|
| committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 17:10:50 +0000 |
| commit | 84350ef4536f877c2e1e5f3b6766a1c9361d76d4 (patch) | |
| tree | f30ce70c8b8a979aafe94e94cfe2c7eb447d9fe7 /components | |
| parent | 3037a702987ad70ba53e3cf4707c397658ed3f23 (diff) | |
| download | chromium_src-84350ef4536f877c2e1e5f3b6766a1c9361d76d4.zip chromium_src-84350ef4536f877c2e1e5f3b6766a1c9361d76d4.tar.gz chromium_src-84350ef4536f877c2e1e5f3b6766a1c9361d76d4.tar.bz2 | |
Pepper: Finish support for dev channel APIs.
This change completes the wiring, adding a file to list dev channel interfaces,
analogous to what exists for different permissions today. We only need to
introduce interfaces_ppb_public_dev_channel.h since we don't anticipate
dev channel APIs with permissions other than NONE.
BUG=325403
R=dmichael@chromium.org
Review URL: https://codereview.chromium.org/112343005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241877 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
| -rw-r--r-- | components/nacl/browser/nacl_process_host.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc index a0868b8..6bd813d 100644 --- a/components/nacl/browser/nacl_process_host.cc +++ b/components/nacl/browser/nacl_process_host.cc @@ -197,6 +197,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); } @@ -806,8 +808,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}; |