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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/pepper_plugin_registry.cc

Issue 5699005: Policy: Re-enabled plugin still disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added empty group prunning. Created 9 years, 11 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
« chrome/browser/plugin_updater.cc ('K') | « chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm ('k') | chrome/renderer/render_view.cc » ('j') | webkit/plugins/npapi/plugin_group.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/pepper_plugin_registry.cc
diff --git a/chrome/common/pepper_plugin_registry.cc b/chrome/common/pepper_plugin_registry.cc
index 963f24894031f9b30a0fd2472727c7dffaed172b..5614d860a51645d4698cc74f9384518fbfe20da5 100644
--- a/chrome/common/pepper_plugin_registry.cc
+++ b/chrome/common/pepper_plugin_registry.cc
@@ -121,6 +121,18 @@ void PepperPluginRegistry::GetPluginInfoFromSwitch(
for (size_t j = 1; j < parts.size(); ++j)
plugin.mime_types.push_back(parts[j]);
+ // Empty description is not allowed so use the plugin base name if none is
jam 2011/01/19 20:22:09 this is not the case anymore, right?
pastarmovj 2011/01/19 23:39:17 Done.
+ // provided.
+ if (plugin.type_descriptions.length() == 0) {
+#if defined(OS_WIN)
+ plugin.type_descriptions =
+ UTF16ToUTF8(plugin.path.BaseName().RemoveExtension().value());
+#else
+ plugin.type_descriptions =
+ plugin.path.BaseName().RemoveExtension().value();
+#endif
+ }
+
plugins->push_back(plugin);
}
}
« chrome/browser/plugin_updater.cc ('K') | « chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm ('k') | chrome/renderer/render_view.cc » ('j') | webkit/plugins/npapi/plugin_group.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698