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

Unified Diff: content/common/pepper_plugin_registry.cc

Issue 10831224: Add pepper permissions to WebPluginInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/pepper_flash.cc ('k') | webkit/plugins/webplugininfo.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/pepper_plugin_registry.cc
diff --git a/content/common/pepper_plugin_registry.cc b/content/common/pepper_plugin_registry.cc
index e054999f6d72fb83c880c0b43c805c12376bc744..259013b3f5b8b77af165965ce7ac878ea255bb27 100644
--- a/content/common/pepper_plugin_registry.cc
+++ b/content/common/pepper_plugin_registry.cc
@@ -96,6 +96,7 @@ webkit::WebPluginInfo content::PepperPluginInfo::ToWebPluginInfo() const {
info.version = ASCIIToUTF16(version);
info.desc = ASCIIToUTF16(description);
info.mime_types = mime_types;
+ info.pepper_permissions = permissions;
return info;
}
@@ -114,6 +115,8 @@ bool MakePepperPluginInfo(const webkit::WebPluginInfo& webplugin_info,
pepper_info->description = UTF16ToASCII(webplugin_info.desc);
pepper_info->version = UTF16ToASCII(webplugin_info.version);
pepper_info->mime_types = webplugin_info.mime_types;
+ pepper_info->permissions = webplugin_info.pepper_permissions;
+
return true;
}
« no previous file with comments | « chrome/common/pepper_flash.cc ('k') | webkit/plugins/webplugininfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698