Bug 1329097 - Port bug 1323129 to IB/TB [remove amIWebInstaller]. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Fri, 06 Jan 2017 08:39:40 +0100
changeset 20968 fe093725162d6a8db7767b423b47dbb52e0c8e0f
parent 20967 8be3e2e18dffce0ce15176138d2fac1bd2018a6d
child 20969 1d94f57f49229d6fe458871714b89c6dcd5e864d
push id12716
push usermozilla@jorgk.com
push dateFri, 06 Jan 2017 08:13:18 +0000
treeherdercomm-central@fe093725162d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk
bugs1329097, 1323129
Bug 1329097 - Port bug 1323129 to IB/TB [remove amIWebInstaller]. r=jorgk
im/content/extensions.js
im/installer/package-manifest.in
mail/base/content/specialTabs.js
mail/installer/package-manifest.in
--- a/im/content/extensions.js
+++ b/im/content/extensions.js
@@ -41,17 +41,17 @@ var addonsRegister = {
   },
 
   // Originally taken from
   // comm-central/source/mail/base/content/specialTabs.js
   observe: function (aSubject, aTopic, aData) {
     let brandBundle = document.getElementById("bundle_brand");
     let extensionsBundle = document.getElementById("bundle_extensions");
 
-    let installInfo = aSubject.QueryInterface(Ci.amIWebInstallInfo);
+    let installInfo = aSubject.wrappedJSObject;
     let notificationBox = document.getElementById("addonsNotify");
     if (!notificationBox)
       return;
     let notificationID = aTopic;
     let brandShortName = brandBundle.getString("brandShortName");
     let notificationName, messageString, buttons;
     const iconURL = "chrome://mozapps/skin/extensions/extensionGeneric.png";
 
--- a/im/installer/package-manifest.in
+++ b/im/installer/package-manifest.in
@@ -518,17 +518,16 @@
 @RESPATH@/components/necko_wifi.xpt
 #endif
 @RESPATH@/components/necko_wyciwyg.xpt
 
 ; extensions
 @RESPATH@/components/addonManager.js
 @RESPATH@/components/amContentHandler.js
 @RESPATH@/components/amInstallTrigger.js
-@RESPATH@/components/amWebInstallListener.js
 @RESPATH@/components/nsBlocklistService.js
 #ifdef MOZ_UPDATER
 @RESPATH@/components/nsUpdateService.js
 @RESPATH@/components/nsUpdateService.manifest
 @RESPATH@/components/nsUpdateServiceStub.js
 #endif
 @RESPATH@/components/nsUpdateTimerManager.js
 @RESPATH@/components/nsUpdateTimerManager.manifest
--- a/mail/base/content/specialTabs.js
+++ b/mail/base/content/specialTabs.js
@@ -1332,17 +1332,17 @@ var specialTabs = {
   },
 
   xpInstallObserver: {
     observe: function (aSubject, aTopic, aData) {
       const Ci = Components.interfaces;
       let brandBundle = document.getElementById("bundle_brand");
       let messengerBundle = document.getElementById("bundle_messenger");
 
-      let installInfo = aSubject.QueryInterface(Ci.amIWebInstallInfo);
+      let installInfo = aSubject.wrappedJSObject;
       let browser = installInfo.browser;
       let notificationBox = getNotificationBox(browser.contentWindow);
       let notificationID = aTopic;
       let brandShortName = brandBundle.getString("brandShortName");
       let notificationName, messageString, buttons;
       const iconURL = "chrome://messenger/skin/icons/update.png";
 
       switch (aTopic) {
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -585,17 +585,16 @@
 @RESPATH@/components/NetworkGeolocationProvider.manifest
 @RESPATH@/components/NetworkGeolocationProvider.js
 @RESPATH@/components/extensions.manifest
 @RESPATH@/components/EditorUtils.manifest
 @RESPATH@/components/EditorUtils.js
 @RESPATH@/components/addonManager.js
 @RESPATH@/components/amContentHandler.js
 @RESPATH@/components/amInstallTrigger.js
-@RESPATH@/components/amWebInstallListener.js
 @RESPATH@/components/nsBlocklistService.js
 #ifdef MOZ_UPDATER
 @RESPATH@/components/nsUpdateService.manifest
 @RESPATH@/components/nsUpdateService.js
 @RESPATH@/components/nsUpdateServiceStub.js
 #endif
 @RESPATH@/components/nsUpdateTimerManager.manifest
 @RESPATH@/components/nsUpdateTimerManager.js