summaryrefslogtreecommitdiffstats
path: root/content/common/pepper_plugin_registry.cc
diff options
context:
space:
mode:
authorraymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-08 00:46:23 +0000
committerraymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-08 00:46:23 +0000
commit0c92b0d1079123c39f6e8fbd7eb3ff6503e9bccd (patch)
treeb6defa7168b626436612114c0176b91c84284beb /content/common/pepper_plugin_registry.cc
parente61449d257bd231d718afe97a19a686feac2219d (diff)
downloadchromium_src-0c92b0d1079123c39f6e8fbd7eb3ff6503e9bccd.zip
chromium_src-0c92b0d1079123c39f6e8fbd7eb3ff6503e9bccd.tar.gz
chromium_src-0c92b0d1079123c39f6e8fbd7eb3ff6503e9bccd.tar.bz2
Refactored the PPB_Flash_File_ModuleLocal/FileRef to the new ppapi resource model
The refactors PPB_Flash_File_ModuleLocal/FileRef to the new resource model. Calls for both these interfaces are now made directly to the browser. This removes the in-process implementation for these interfaces also (as they are flash-only). Tests are added for PPB_Flash_File_ModuleLocal. Review URL: https://codereview.chromium.org/11359097 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/pepper_plugin_registry.cc')
-rw-r--r--content/common/pepper_plugin_registry.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/common/pepper_plugin_registry.cc b/content/common/pepper_plugin_registry.cc
index 6db31e7..457ee8f 100644
--- a/content/common/pepper_plugin_registry.cc
+++ b/content/common/pepper_plugin_registry.cc
@@ -70,6 +70,10 @@ void ComputePluginsFromCommandLine(std::vector<PepperPluginInfo>* plugins) {
plugin.mime_types.push_back(mime_type);
}
+ // If the plugin name is empty, use the filename.
+ if (plugin.name.empty())
+ plugin.name = UTF16ToUTF8(plugin.path.BaseName().LossyDisplayName());
+
// Command-line plugins get full permissions.
plugin.permissions = ppapi::PERMISSION_ALL_BITS;