Backed out 2 changesets (bug 1801954, bug 1863980) for bc failures on browser_setDefaultBrowser.js. CLOSED TREE

Backed out changeset b96506a6d950 (bug 1801954)
Backed out changeset 306a649fcc00 (bug 1863980)

browser/components/preferences/main.js

@@ -1734,7 +1734,7 @@ var gMainPane = {
   /**
    * Set browser as the operating system default browser.
    */
-  async setDefaultBrowser() {
+  setDefaultBrowser() {
     if (AppConstants.HAVE_SHELL_SERVICE) {
       let alwaysCheckPref = Preferences.get(
         "browser.shell.checkDefaultBrowser"
@@ -1748,20 +1748,11 @@ var gMainPane = {
       if (!shellSvc) {
         return;
       }
-
-      // Disable the set default button, so that the user doesn't try to hit it again
-      // while awaiting on setDefaultBrowser
-      let setDefaultButton = document.getElementById("setDefaultButton");
-      setDefaultButton.disabled = true;
-
       try {
-        await shellSvc.setDefaultBrowser(false);
+        shellSvc.setDefaultBrowser(false);
       } catch (ex) {
         console.error(ex);
         return;
-      } finally {
-        // Make sure to re-enable the default button when we're finished, regardless of the outcome
-        setDefaultButton.disabled = false;
       }
 
       let isDefault = shellSvc.isDefaultBrowser(false, true);