From f7da94d82a9bb386cb49a3e2b5bb59ae458188a2 Mon Sep 17 00:00:00 2001
From: "reed%reedloden.com"
 <reed%reedloden.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 24 Jan 2008 07:30:42 +0000
Subject: [PATCH] Bug 410124 - "Support plugin blocklist notification"
 [p=twanno@lycos.nl (Teune van Steeg) r=Neil sr=jag]

git-svn-id: svn://10.0.0.236/trunk@243885 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../suite/common/bindings/notification.xml    | 82 +++++++++++++++++++
 .../chrome/common/notification.properties     |  6 ++
 2 files changed, 88 insertions(+)

diff --git a/mozilla/suite/common/bindings/notification.xml b/mozilla/suite/common/bindings/notification.xml
index 234ab9b4826..7bd1f7454a1 100644
--- a/mozilla/suite/common/bindings/notification.xml
+++ b/mozilla/suite/common/bindings/notification.xml
@@ -480,6 +480,10 @@
           this.missingPlugins[pluginInfo.mimetype] = pluginInfo;
 
           if (!this.getNotificationWithValue("missing-plugins")) {
+            var blockedNotification = this.getNotificationWithValue("blocked-plugins");
+            if (blockedNotification)
+              blockedNotification.close();
+
             var self = this;
             var messageString = this._stringBundle.GetStringFromName("missingpluginsMessage.title");
             var buttons = [{
@@ -501,6 +505,84 @@
         ]]>
       </handler>
 
+      <handler event="PluginBlocklisted">
+        <![CDATA[
+          // Since we are expecting also untrusted events, make sure
+          // that the target is a plugin
+          if (!(event.target instanceof Components.interfaces.nsIObjectLoadingContent))
+            return;
+
+          if (this._prefs.getBoolPref("plugins.hide_infobar_for_missing_plugin"))
+            return;
+
+          var pluginInfo = this.getPluginInfo(event.target);
+          this.missingPlugins[pluginInfo.mimetype] = pluginInfo;
+
+          if (this.getNotificationWithValue("missing-plugins") ||
+              this.getNotificationWithValue("blocked-plugins"))
+            return;
+
+          var self = this;
+          var messageString = this._stringBundle.GetStringFromName("blockedpluginsMessage.title");
+          var buttons = [{
+            label: this._stringBundle.GetStringFromName("blockedpluginsMessage.infoButton.label"),
+            accessKey: this._stringBundle.GetStringFromName("blockedpluginsMessage.infoButton.accesskey"),
+            popup: null,
+            callback: function getBlocklistInfo() {
+              var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
+                                        .getService(Components.interfaces.nsIURLFormatter);
+              var url = formatter.formatURLPref("extensions.blocklist.detailsURL");
+
+              const kExistingWindow = Components.interfaces.nsIBrowserDOMWindow.OPEN_CURRENTWINDOW;
+              const kNewWindow = Components.interfaces.nsIBrowserDOMWindow.OPEN_NEWWINDOW;
+
+              var browserWin;
+              var whereToOpen = self._prefs.getIntPref("browser.link.open_external");
+
+              if (whereToOpen != kNewWindow) {
+                var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1']
+                                              .getService(Components.interfaces.nsIWindowMediator);
+                browserWin = windowManager.getMostRecentWindow("navigator:browser");
+              }
+
+              if (!browserWin) {
+                var browserURL = "chrome://navigator/content/navigator.xul";
+                try {
+                  browserURL = self._prefs.getCharPref("browser.chromeURL");
+                } catch (ex) {}
+
+                window.openDialog(browserURL, "_blank", "chrome,all,dialog=no", url);
+              } else {
+                if (whereToOpen == kExistingWindow)
+                  browserWin.loadURI(url);
+                else {
+                  // new tab
+                  var browser = browserWin.getBrowser();
+                  var newTab = browser.addTab(url);
+                  browser.selectedTab = newTab;
+                }
+                browserWin.content.focus();
+              }
+              return true;
+            }
+          }, {
+            label: this._stringBundle.GetStringFromName("blockedpluginsMessage.searchButton.label"),
+            accessKey: this._stringBundle.GetStringFromName("blockedpluginsMessage.searchButton.accesskey"),
+            popup: null,
+            callback: function openPluginInstallerWizard() {
+              window.openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
+                                "", "chrome,resizable=yes",
+                                {plugins: self.missingPlugins, browser: self.activeBrowser});
+            }
+          }];
+
+          const priority = this.PRIORITY_WARNING_MEDIUM;
+          const iconURL = "chrome://mozapps/skin/plugins/pluginGeneric.png";
+          this.appendNotification(messageString, "blocked-plugins",
+                                  iconURL, priority, buttons);
+        ]]>
+      </handler>
+
       <handler event="NewPluginInstalled">
         <![CDATA[
           this.missingPlugins = {};
diff --git a/mozilla/suite/locales/en-US/chrome/common/notification.properties b/mozilla/suite/locales/en-US/chrome/common/notification.properties
index b78b6aaa5cb..c51e9bf7de2 100644
--- a/mozilla/suite/locales/en-US/chrome/common/notification.properties
+++ b/mozilla/suite/locales/en-US/chrome/common/notification.properties
@@ -2,6 +2,12 @@ missingpluginsMessage.title=Additional plugins are required to display all the m
 missingpluginsMessage.button.label=Install Missing Plugins...
 missingpluginsMessage.button.accesskey=I
 
+blockedpluginsMessage.title=Some plugins required by this page have been blocked for your protection.
+blockedpluginsMessage.infoButton.label=Details...
+blockedpluginsMessage.infoButton.accesskey=D
+blockedpluginsMessage.searchButton.label=Update Plugins...
+blockedpluginsMessage.searchButton.accesskey=U
+
 popupWarning=%S prevented this site from opening a popup window.
 popupWarningMultiple=%S prevented this site from opening %S popup windows.
 popupWarningButton=Preferences