summaryrefslogtreecommitdiffstats
path: root/content/ppapi_plugin/ppapi_thread.cc
diff options
context:
space:
mode:
authorteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-12 20:42:06 +0000
committerteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-12 20:42:06 +0000
commit8ddc6b7c44630c67acd9c6b5dceaa1e6cce67431 (patch)
tree6132eb484acd52716648fb444f6790d4934f8d7d /content/ppapi_plugin/ppapi_thread.cc
parent46a20dedad3c121fa8368641d01962f20b21f79f (diff)
downloadchromium_src-8ddc6b7c44630c67acd9c6b5dceaa1e6cce67431.zip
chromium_src-8ddc6b7c44630c67acd9c6b5dceaa1e6cce67431.tar.gz
chromium_src-8ddc6b7c44630c67acd9c6b5dceaa1e6cce67431.tar.bz2
Pepper: Send dev/canary channel status to plugins.
As part of supporting "dev channel" methods in Pepper APIs, the plugin needs to know whether or not it's running in a channel that supports those methods. This patch plumbs that information through LoadPlugin so it's available by the time get_interface<>() would ever be called. TBR=piman BUG=325403 Review URL: https://codereview.chromium.org/104673003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin/ppapi_thread.cc')
-rw-r--r--content/ppapi_plugin/ppapi_thread.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc
index 5ed1873..c79ad23 100644
--- a/content/ppapi_plugin/ppapi_thread.cc
+++ b/content/ppapi_plugin/ppapi_thread.cc
@@ -206,7 +206,8 @@ void PpapiThread::Unregister(uint32 plugin_dispatcher_id) {
}
void PpapiThread::OnLoadPlugin(const base::FilePath& path,
- const ppapi::PpapiPermissions& permissions) {
+ const ppapi::PpapiPermissions& permissions,
+ bool supports_dev_channel) {
// In case of crashes, the crash dump doesn't indicate which plugin
// it came from.
base::debug::SetCrashKeyValue("ppapi_path", path.MaybeAsASCII());
@@ -216,6 +217,7 @@ void PpapiThread::OnLoadPlugin(const base::FilePath& path,
// This must be set before calling into the plugin so it can get the
// interfaces it has permission for.
ppapi::proxy::InterfaceList::SetProcessGlobalPermissions(permissions);
+ ppapi::proxy::InterfaceList::SetSupportsDevChannel(supports_dev_channel);
permissions_ = permissions;
// Trusted Pepper plugins may be "internal", i.e. built-in to the browser