Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I0dd7c64669f4b130047a4a3836f62f7ee5b5f8d9

1 files changed, 3 insertions, 2 deletions

diff --git a/src/core/extensions/extension_system_qt.cpp b/src/core/extensions/extension_system_qt.cpp
index 9c080e9aa..285b27729 100644
--- a/src/core/extensions/extension_system_qt.cpp
+++ b/src/core/extensions/extension_system_qt.cpp
@@ -223,11 +223,12 @@ void ExtensionSystemQt::NotifyExtensionLoaded(const Extension *extension)
     // Register plugins included with the extension.
     // Implementation based on PluginManager::OnExtensionLoaded.
     const MimeTypesHandler *handler = MimeTypesHandler::GetHandler(extension);
-    if (handler && !handler->handler_url().empty()) {
+    if (handler && handler->HasPlugin()) {
         content::WebPluginInfo info;
         info.type = content::WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN;
         info.name = base::UTF8ToUTF16(extension->name());
-        info.path = base::FilePath::FromUTF8Unsafe(extension->url().spec());
+        info.path = handler->GetPluginPath();
+        info.background_color = handler->GetBackgroundColor();
         for (std::set<std::string>::const_iterator mime_type = handler->mime_type_set().begin();
              mime_type != handler->mime_type_set().end(); ++mime_type) {
             content::WebPluginMimeType mime_type_info;