Bug 1333620 Show the old post-install confirmation for non-restartless extensions draft
authorAndrew Swan <aswan@mozilla.com>
Thu, 02 Feb 2017 14:29:34 -0800
changeset 469844 3e3eb1e3717bbd56559d533872ef519c25525a29
parent 469123 f3d187bd0733b1182dffc97b5dfe623e18f92a44
child 544330 7119f6a5b6f5203cf397589d6ef29e55bd010e9b
push id43871
push useraswan@mozilla.com
push dateThu, 02 Feb 2017 22:37:07 +0000
bugs1333620
milestone54.0a1
Bug 1333620 Show the old post-install confirmation for non-restartless extensions MozReview-Commit-ID: FXAv4mzFsdI
toolkit/mozapps/extensions/AddonManager.jsm
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/mozapps/extensions/AddonManager.jsm
@@ -2105,17 +2105,19 @@ var AddonManagerInternal = {
         // If installing a theme that is disabled and can be enabled
         // then enable it
         if (install.addon.type == "theme" &&
             install.addon.userDisabled == true &&
             install.addon.appDisabled == false) {
               install.addon.userDisabled = false;
         }
 
-        if (WEBEXT_PERMISSION_PROMPTS) {
+        let needsRestart = (install.addon.pendingOperations != AddonManager.PENDING_NONE);
+
+        if (WEBEXT_PERMISSION_PROMPTS && !needsRestart) {
           let subject = {wrappedJSObject: {target: browser, addon: install.addon}};
           Services.obs.notifyObservers(subject, "webextension-install-notify", null);
         } else {
           self.installNotifyObservers("addon-install-complete", browser, url, install);
         }
       },
     };