Bug 1360904 - Don't show the legacy add-on warning. r=jorgk
☠☠ backed out by 9df8d7adb74f ☠ ☠
authorRichard Marti <richard.marti@gmail.com>
Tue, 02 May 2017 12:12:53 +0200
changeset 21515 b12259f574a02b28866e7a032ccb070eca65a415
parent 21514 a7d9e926d66e7d79b2292945d7897cb5c9efe553
child 21516 85e4fa4ed2d3c37f65cd820836d781b503dfd560
push id13096
push usermozilla@jorgk.com
push dateWed, 03 May 2017 06:31:29 +0000
treeherdercomm-central@b12259f574a0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk
bugs1360904
Bug 1360904 - Don't show the legacy add-on warning. r=jorgk
mail/base/content/extensionsOverlay.css
mail/base/content/mailCore.js
mail/base/jar.mn
new file mode 100644
--- /dev/null
+++ b/mail/base/content/extensionsOverlay.css
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+.legacy-warning {
+  display: none;
+}
--- a/mail/base/content/mailCore.js
+++ b/mail/base/content/mailCore.js
@@ -456,17 +456,17 @@ function openAddonsMgr(aView)
       emWindow.loadView(aView);
       let tabmail = browserWindow.document.getElementById("tabmail");
       tabmail.switchToTab(tabmail.getBrowserForDocument(emWindow));
       emWindow.focus();
       return;
     }
   }
 
-  openContentTab("about:addons", "tab", "addons.mozilla.org");
+  openContentTab("chrome://mozapps/content/extensions/extensions.xul", "tab", "addons.mozilla.org");
 
 
   if (aView) {
     // This must be a new load, else the ping/pong would have
     // found the window above.
     Services.obs.addObserver(function loadViewOnLoad(aSubject, aTopic, aData) {
       Services.obs.removeObserver(loadViewOnLoad, aTopic);
       aSubject.loadView(aView);
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -1,25 +1,27 @@
 messenger.jar:
 % content messagebody %content/messagebody/ contentaccessible=yes
 % content messenger %content/messenger/
 % override chrome://global/content/nsDragAndDrop.js chrome://messenger/content/nsDragAndDrop.js
 % override chrome://messagebody/skin/messageBody.css chrome://messenger/skin/messageBody.css
 % overlay chrome://global/content/viewSource.xul chrome://messenger/content/viewSourceOverlay.xul
 % overlay chrome://global/content/config.xul chrome://messenger/content/configEditorOverlay.xul
 % overlay chrome://editor/content/EdSpellCheck.xul chrome://messenger/content/EdSpellCheckOverlay.xul
+% style chrome://mozapps/content/extensions/extensions.xul chrome://messenger/content/extensionsOverlay.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/content/messenger.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/addressbook/addressbook.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/messengercompose/messengercompose.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/smime/msgCompSMIMEOverlay.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/messageHeader.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/primaryToolbar.css
     content/messenger/mailWindow.js                 (content/mailWindow.js)
     content/messenger/messageDisplay.js             (content/messageDisplay.js)
+    content/messenger/extensionsOverlay.css         (content/extensionsOverlay.css)
     content/messenger/folderDisplay.js              (content/folderDisplay.js)
     content/messenger/mailWindowOverlay.js          (content/mailWindowOverlay.js)
 *   content/messenger/mailWindowOverlay.xul         (content/mailWindowOverlay.xul)
     content/messenger/extraCustomizeItems.xul       (content/extraCustomizeItems.xul)
 *   content/messenger/mailOverlay.xul               (content/mailOverlay.xul)
 *   content/messenger/messageWindow.xul             (content/messageWindow.xul)
     content/messenger/messageWindow.js              (content/messageWindow.js)
     content/messenger/mailContextMenus.js           (content/mailContextMenus.js)