diff options
| author | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 00:16:12 +0000 |
|---|---|---|
| committer | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 00:16:12 +0000 |
| commit | 6d079b9a62065433b24eae83ad689d3defb628df (patch) | |
| tree | 0663f595a6aa0f8d25280aac3c814bb246e7dd3d /chrome/common/pepper_plugin_registry.cc | |
| parent | 472e207c9b8d644cb286200f364b21cbeb54e0b3 (diff) | |
| download | chromium_src-6d079b9a62065433b24eae83ad689d3defb628df.zip chromium_src-6d079b9a62065433b24eae83ad689d3defb628df.tar.gz chromium_src-6d079b9a62065433b24eae83ad689d3defb628df.tar.bz2 | |
Fix pepper plugin description regression
CL http://codereview.chromium.org/6162008 broke descriptions for pepper plugins.
This puts it back to the previous state (we don't have a way to separately give
mime type descriptions vs plugin descriptions)
BUG=cros:11298
TEST=Flash on CNN
Review URL: http://codereview.chromium.org/6327019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/pepper_plugin_registry.cc')
| -rw-r--r-- | chrome/common/pepper_plugin_registry.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/common/pepper_plugin_registry.cc b/chrome/common/pepper_plugin_registry.cc index 963f248..dc852d9 100644 --- a/chrome/common/pepper_plugin_registry.cc +++ b/chrome/common/pepper_plugin_registry.cc @@ -116,8 +116,10 @@ void PepperPluginRegistry::GetPluginInfoFromSwitch( #endif if (name_parts.size() > 1) plugin.name = name_parts[1]; - if (name_parts.size() > 2) + if (name_parts.size() > 2) { + plugin.description = name_parts[2]; plugin.type_descriptions = name_parts[2]; + } for (size_t j = 1; j < parts.size(); ++j) plugin.mime_types.push_back(parts[j]); |