Bug 1509297 - Fix the path to the plugin SVG files after bug 1497940 and add pref dom.ua_widget.enabled. r=jorgk CLOSED TREE DONTBUILD
authorRichard Marti <richard.marti@gmail.com>
Thu, 22 Nov 2018 13:50:00 +0100
changeset 33762 0144b5d6b006fa15f8c2fdb68c935f5ff15a7639
parent 33761 46fb423d7ced6a68bcc7bbb9b3a8e788a8a695cf
child 33763 5af3c13ff2eeaa2889348519ff7e40353c84deb1
push id388
push userclokep@gmail.com
push dateMon, 28 Jan 2019 20:54:56 +0000
reviewersjorgk
bugs1509297, 1497940
Bug 1509297 - Fix the path to the plugin SVG files after bug 1497940 and add pref dom.ua_widget.enabled. r=jorgk CLOSED TREE DONTBUILD
mail/app/profile/all-thunderbird.js
mail/base/content/plugins.js
mail/themes/linux/mail/preferences/applications.css
mail/themes/osx/mail/preferences/applications.css
mail/themes/windows/mail/preferences/applications.css
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -732,16 +732,19 @@ pref("dom.ipc.plugins.enabled", true);
 // OS calls in the plugin process, then arranging to make certain OS calls
 // in the browser process.  Eventually plugins will be required to use the
 // NPAPI to manipulate the cursor, and these workarounds will be removed.
 // See bug 621117.
 #ifdef XP_MACOSX
 pref("dom.ipc.plugins.nativeCursorSupport", true);
 #endif
 
+// Refer to bug 1509297 for details. For now, we disable the new UA widget to make tests pass.
+pref("dom.ua_widget.enabled", false);
+
 // plugin finder service url
 pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.
 php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=
 %CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
 
 // By default we show an infobar message when pages require plugins that are
 // outdated.
 pref("plugins.hide_infobar_for_outdated_plugin", false);
--- a/mail/base/content/plugins.js
+++ b/mail/base/content/plugins.js
@@ -384,30 +384,30 @@ var gPluginHandler = {
           label: messengerBundle.getString("blockedpluginsMessage.searchButton.label"),
           accessKey: messengerBundle.getString("blockedpluginsMessage.searchButton.accesskey"),
           popup: null,
           callback: showOutdatedPluginsInfo,
         }],
       },
       PluginOutdated: {
         barID: "outdated-plugins",
-        iconURL: "chrome://mozapps/skin/plugins/pluginGeneric.svg",
+        iconURL: "chrome://global/skin/plugins/pluginGeneric.svg",
         message: messengerBundle.getString("outdatedpluginsMessage.title"),
         buttons: [{
           label: messengerBundle.getString("outdatedpluginsMessage.updateButton.label"),
           accessKey: messengerBundle.getString("outdatedpluginsMessage.updateButton.accesskey"),
           popup: null,
           callback: showOutdatedPluginsInfo,
         }],
       },
     };
     if (AppConstants.platform == "macosx") {
       notifications["npapi-carbon-event-model-failure"] = {
         barID: "carbon-failure-plugins",
-        iconURL: "chrome://mozapps/skin/plugins/pluginGeneric.svg",
+        iconURL: "chrome://global/skin/plugins/pluginGeneric.svg",
         message: messengerBundle.getString("carbonFailurePluginsMessage.message"),
         buttons: [{
           label: messengerBundle.getString("carbonFailurePluginsMessage.restartButton.label"),
           accessKey: messengerBundle.getString("carbonFailurePluginsMessage.restartButton.accesskey"),
           popup: null,
           callback: carbonFailurePluginsRestartBrowser,
         }],
       };
@@ -619,17 +619,17 @@ var gPluginHandler = {
       // If there's already an existing notification bar, don't do anything.
       let messengerBundle = document.getElementById("bundle_messenger");
       let notification = notificationBox.getNotificationWithValue("plugin-crashed");
       if (notification)
         return;
 
       // Configure the notification bar
       let priority = notificationBox.PRIORITY_WARNING_MEDIUM;
-      let iconURL = "chrome://mozapps/skin/plugins/pluginGeneric.svg";
+      let iconURL = "chrome://global/skin/plugins/pluginGeneric.svg";
       let reloadLabel = messengerBundle.getString("crashedpluginsMessage.reloadButton.label");
       let reloadKey   = messengerBundle.getString("crashedpluginsMessage.reloadButton.accesskey");
       let submitLabel = messengerBundle.getString("crashedpluginsMessage.submitButton.label");
       let submitKey   = messengerBundle.getString("crashedpluginsMessage.submitButton.accesskey");
 
       let buttons = [{
         label: reloadLabel,
         accessKey: reloadKey,
--- a/mail/themes/linux/mail/preferences/applications.css
+++ b/mail/themes/linux/mail/preferences/applications.css
@@ -32,17 +32,17 @@ menuitem[appHandlerIcon="ask"] {
 
 richlistitem[appHandlerIcon="save"],
 menuitem[appHandlerIcon="save"] {
   list-style-image: url("moz-icon://stock/gtk-save?size=menu");
 }
 
 richlistitem[appHandlerIcon="plugin"],
 menuitem[appHandlerIcon="plugin"] {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.svg");
+  list-style-image: url("chrome://global/skin/plugins/pluginGeneric.svg");
 }
 
 .actionsMenu .menulist-icon {
   margin-inline-end: 1px;
   height: 16px;
   width: 16px;
 }
 
--- a/mail/themes/osx/mail/preferences/applications.css
+++ b/mail/themes/osx/mail/preferences/applications.css
@@ -35,17 +35,17 @@ menuitem[appHandlerIcon="ask"] {
 
 richlistitem[appHandlerIcon="save"],
 menuitem[appHandlerIcon="save"] {
   list-style-image: url("chrome://messenger/skin/preferences/saveFile.png");
 }
 
 richlistitem[appHandlerIcon="plugin"],
 menuitem[appHandlerIcon="plugin"] {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.svg");
+  list-style-image: url("chrome://global/skin/plugins/pluginGeneric.svg");
 }
 
 .actionsMenu .menulist-icon {
   margin-inline-end: 1px;
 }
 
 .actionsMenu > menupopup > menuitem > .menu-iconic-left {
   padding-inline-start: 3px;
--- a/mail/themes/windows/mail/preferences/applications.css
+++ b/mail/themes/windows/mail/preferences/applications.css
@@ -36,17 +36,17 @@ menuitem[appHandlerIcon="ask"] {
 
 richlistitem[appHandlerIcon="save"],
 menuitem[appHandlerIcon="save"] {
   list-style-image: url("chrome://messenger/skin/preferences/saveFile.png");
 }
 
 richlistitem[appHandlerIcon="plugin"],
 menuitem[appHandlerIcon="plugin"] {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.svg");
+  list-style-image: url("chrome://global/skin/plugins/pluginGeneric.svg");
 }
 
 .actionsMenu .menulist-icon {
   margin-inline-end: 3px;
 }
 
 .actionsMenu > menupopup > menuitem > .menu-iconic-left {
   padding-inline-start: 0px;