Index: content/browser/plugin_service.cc |
=================================================================== |
--- content/browser/plugin_service.cc (revision 96718) |
+++ content/browser/plugin_service.cc (working copy) |
@@ -492,7 +492,22 @@ |
break; |
} |
} |
- return info; |
+ if (info) |
+ return info; |
+ // We did not find the plugin in our list. But wait! the plugin can also |
+ // be a latecomer, as it happens with pepper flash. This information |
+ // can be obtained from the PluginList singleton and we can use it to |
+ // construct it and add it to the list. This same deal needs to be done |
+ // in the renderer side in PepperPluginRegistry. |
+ webkit::WebPluginInfo webplugin_info; |
+ if (!webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath( |
+ plugin_path, &webplugin_info)) |
+ return NULL; |
+ PepperPluginInfo new_pepper_info; |
+ if (!MakePepperPluginInfo(webplugin_info, &new_pepper_info)) |
+ return NULL; |
+ ppapi_plugins_.push_back(new_pepper_info); |
+ return &ppapi_plugins_[ppapi_plugins_.size() - 1]; |
} |
#if defined(OS_POSIX) && !defined(OS_MACOSX) |