diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 18:05:44 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 18:05:44 +0000 |
| commit | 2fb3e36cba45f937baadec58dca6e3dfb3a92519 (patch) | |
| tree | d741e9acaaf8b7c6aa3910fb81f98870e2daadc1 /chrome/browser/plugin_service.cc | |
| parent | 46210f046927e1d822da3fd46a8ef87df28043e4 (diff) | |
| download | chromium_src-2fb3e36cba45f937baadec58dca6e3dfb3a92519.zip chromium_src-2fb3e36cba45f937baadec58dca6e3dfb3a92519.tar.gz chromium_src-2fb3e36cba45f937baadec58dca6e3dfb3a92519.tar.bz2 | |
Allow Pepper plugins to make requests with relative urls. Also allow bundled Pepper plugins to specify file extensions.
BUG=48140
Review URL: http://codereview.chromium.org/2806049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_service.cc')
| -rw-r--r-- | chrome/browser/plugin_service.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc index f4a015e..7b863d4 100644 --- a/chrome/browser/plugin_service.cc +++ b/chrome/browser/plugin_service.cc @@ -362,7 +362,12 @@ void PluginService::RegisterPepperPlugins() { for (size_t i = 0; i < plugins.size(); ++i) { NPAPI::PluginVersionInfo info; info.path = plugins[i].path; - info.product_name = plugins[i].path.BaseName().ToWStringHack(); + info.product_name = plugins[i].name.empty() ? + plugins[i].path.BaseName().ToWStringHack() : + ASCIIToWide(plugins[i].name); + info.file_description = ASCIIToWide(plugins[i].description); + info.file_extensions = ASCIIToWide(plugins[i].file_extensions); + info.file_description = ASCIIToWide(plugins[i].type_descriptions); info.mime_types = ASCIIToWide(JoinString(plugins[i].mime_types, '|')); // These NPAPI entry points will never be called. TODO(darin): Come up |