From bc6aa2d6381b20d62bcfa0e778e354f1fe8edf18 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git@torproject.org>
Date: Tue, 10 Sep 2013 18:14:40 -0700
Subject: [PATCH] Bug 8312: Remove "This plugin is disabled" barrier.

We do not want to encourage our users to enable plugins at this point.

The barrier also causes bad UX for HTML5 video fallback on YouTube.
---
 browser/actors/PluginChild.jsm           | 12 +++++-------
 toolkit/content/widgets/pluginProblem.js |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/browser/actors/PluginChild.jsm b/browser/actors/PluginChild.jsm
index 4d1e802318fc5..3ab8009ff6fc1 100644
--- a/browser/actors/PluginChild.jsm
+++ b/browser/actors/PluginChild.jsm
@@ -529,6 +529,7 @@ class PluginChild extends ActorChild {
     }
 
     let plugin = event.target;
+    let doc = plugin.ownerDocument;
 
     if (!(plugin instanceof Ci.nsIObjectLoadingContent)) {
       return;
@@ -607,13 +608,10 @@ class PluginChild extends ActorChild {
         break;
 
       case "PluginDisabled":
-        let manageLink = this.getPluginUI(plugin, "managePluginsLink");
-        this.addLinkClickCallback(
-          manageLink,
-          "forwardCallback",
-          "managePlugins"
-        );
-        shouldShowNotification = true;
+        // Screw the disabled message. It messes with HTML5 fallback on YouTube
+        let plugin_overlay = doc.getAnonymousElementByAttribute(plugin, "class", "mainBox");
+        if (plugin_overlay != null)
+          plugin_overlay.style.visibility = "hidden";
         break;
 
       case "PluginInstantiated":
diff --git a/toolkit/content/widgets/pluginProblem.js b/toolkit/content/widgets/pluginProblem.js
index d53a2381d4e80..e2cd6a0b61385 100644
--- a/toolkit/content/widgets/pluginProblem.js
+++ b/toolkit/content/widgets/pluginProblem.js
@@ -45,7 +45,7 @@ this.PluginProblemWidget = class {
             <div class="msgReload">&reloadPlugin.pre;<a class="reloadLink" id="reloadLink" href="">&reloadPlugin.middle;</a>&reloadPlugin.post;</div>
           </div>
 
-          <div class="msg msgManagePlugins"><a class="action-link" id="managePluginsLink" href="">&managePlugins;</a></div>
+          <div class="msg msgManagePlugins"><a class="action-link" id="managePluginsLink" href=""></a></div>
           <div class="submitStatus" id="submitStatus">
             <div class="msg msgPleaseSubmit" id="pleaseSubmit">
               <textarea class="submitComment"
-- 
GitLab