From ebe708381a2473d7149cf558cab791274bc92de9 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Fri, 9 Oct 2015 14:25:57 -0700
Subject: [PATCH 1/8] Bug 1213366 - Remove android: prefix from colorPrimary*.
 r=sebastian

This changes the color of the settings action bar to grey, as expected.

Note that I was unaware of this no-prefix convention when I wrote the previous
patch and added an "android:actionBarStyle" which may be confusing things
further. We may also benefit from removing the prefix there and fixing the
results.

--HG--
extra : commitid : 6aYSAKTkbkB
extra : rebase_source : cc66caa6da48dce95b58f4fd225ac01f1ffa9ee7
---
 mobile/android/base/resources/values-v21/themes.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/resources/values-v21/themes.xml b/mobile/android/base/resources/values-v21/themes.xml
index 939d7a32c66c..55d575599e0e 100644
--- a/mobile/android/base/resources/values-v21/themes.xml
+++ b/mobile/android/base/resources/values-v21/themes.xml
@@ -9,8 +9,8 @@
         Base application theme.
     -->
     <style name="GeckoBase" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="android:colorPrimary">@color/text_and_tabs_tray_grey</item>
-        <item name="android:colorPrimaryDark">@color/text_and_tabs_tray_grey</item>
+        <item name="colorPrimary">@color/text_and_tabs_tray_grey</item>
+        <item name="colorPrimaryDark">@color/text_and_tabs_tray_grey</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:actionBarStyle">@style/GeckoActionBar</item>

From 21d6020db66c6e31192a38857852b58ed2d6e8bd Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Mon, 12 Oct 2015 23:03:23 +0200
Subject: [PATCH 2/8] Bug 1194706: make sure that the notification icons and
 doorhangers are shown in undocked chat windows too. r=Mossop

---
 toolkit/modules/PopupNotifications.jsm | 35 ++++++++++++++------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/toolkit/modules/PopupNotifications.jsm b/toolkit/modules/PopupNotifications.jsm
index ede1d8af153a..729cf09d305c 100644
--- a/toolkit/modules/PopupNotifications.jsm
+++ b/toolkit/modules/PopupNotifications.jsm
@@ -690,14 +690,10 @@ PopupNotifications.prototype = {
 
     if (!notifications)
       notifications = this._currentNotifications;
-    let notificationsToShow = [];
-    // Filter out notifications that have been dismissed.
-    notificationsToShow = notifications.filter(function (n) {
-      return !n.dismissed && !n.options.neverShow;
-    });
 
-    if (!anchors.size && notificationsToShow.length)
-      anchors = this._getAnchorsForNotifications(notificationsToShow);
+    let haveNotifications = notifications.length > 0;
+    if (!anchors.size && haveNotifications)
+      anchors = this._getAnchorsForNotifications(notifications);
 
     let useIconBox = !!this.iconBox;
     if (useIconBox && anchors.size) {
@@ -709,24 +705,31 @@ PopupNotifications.prototype = {
       }
     }
 
+    // Filter out notifications that have been dismissed.
+    let notificationsToShow = notifications.filter(function (n) {
+      return !n.dismissed && !n.options.neverShow;
+    });
+
     if (useIconBox) {
-      // hide icons of the previous tab.
+      // Hide icons of the previous tab.
       this._hideIcons();
     }
 
-    let haveNotifications = notifications.length > 0;
     if (haveNotifications) {
-      if (useIconBox) {
-        this._showIcons(notifications);
-        this.iconBox.hidden = false;
-      } else if (anchors.size) {
-        this._updateAnchorIcons(notifications, anchors);
-      }
-
       // Also filter out notifications that are for a different anchor.
       notificationsToShow = notificationsToShow.filter(function (n) {
         return anchors.has(n.anchorElement);
       });
+
+      if (useIconBox) {
+        this._showIcons(notifications);
+        this.iconBox.hidden = false;
+        // Make sure that panels can only be attached to anchors of shown
+        // notifications inside an iconBox.
+        anchors = this._getAnchorsForNotifications(notificationsToShow);
+      } else if (anchors.size) {
+        this._updateAnchorIcons(notifications, anchors);
+      }
     }
 
     if (notificationsToShow.length > 0) {

From b51e65efbaa7df8e59b559976a6305d19a1c5009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Tue, 13 Oct 2015 00:03:51 +0200
Subject: [PATCH 3/8] Bug 1184651 - Use flat background instead of gradient for
 the navigation toolbar on Windows 10 and 8 and Linux. r=jaws

---
 browser/themes/linux/browser.css         |  8 ++++++--
 browser/themes/linux/linuxShared.inc     |  2 +-
 browser/themes/osx/shared.inc            |  4 ++--
 browser/themes/windows/browser.css       | 24 +++++++++++++++++++-----
 browser/themes/windows/windowsShared.inc |  4 ++--
 5 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 537efb6feb4e..8ecb0f0e94ae 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -64,6 +64,10 @@
   background-color: rgba(0,0,0,.3);
 }
 
+#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar) {
+  background-image: linear-gradient(@toolbarHighlight@, @toolbarHighlight@);
+}
+
 #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) {
   -moz-appearance: none;
   border-style: none;
@@ -98,7 +102,6 @@
 }
 
 #nav-bar {
-  background-image: linear-gradient(@toolbarHighlight@, transparent);
   box-shadow: 0 1px 0 @toolbarHighlight@ inset;
   padding-top: 2px;
   padding-bottom: 2px;
@@ -1515,11 +1518,12 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 64, 16, 48);
 }
 
+.tab-close-button:not(:hover):-moz-lwtheme-brighttext,
 #TabsToolbar[brighttext] .tab-close-button:not([visuallyselected]):not(:hover) {
   background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 80, 16, 64);
 }
 
-.tab-close-button:not([visuallyselected]):not(:hover):-moz-lwtheme-darktext {
+.tab-close-button:not(:hover):-moz-lwtheme-darktext {
   background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 96, 16, 80);
 }
 
diff --git a/browser/themes/linux/linuxShared.inc b/browser/themes/linux/linuxShared.inc
index fc70d58aab98..fcd9eae17369 100644
--- a/browser/themes/linux/linuxShared.inc
+++ b/browser/themes/linux/linuxShared.inc
@@ -5,6 +5,6 @@
 %filter substitution
 
 %define toolbarHighlight rgba(255,255,255,.3)
-%define fgTabTexture linear-gradient(transparent 0px, transparent 2px, hsla(0,0%,100%,0.35) 2px, hsla(0,0%,100%,0.35) 3px, hsla(0,0%,100%,0.65) 3px, hsla(0,0%,100%,0.65) 4px, @toolbarHighlight@)
+%define fgTabTexture linear-gradient(transparent 2px, @toolbarHighlight@ 2px, @toolbarHighlight@)
 %define fgTabTextureLWT @fgTabTexture@
 %define fgTabBackgroundColor -moz-dialog
diff --git a/browser/themes/osx/shared.inc b/browser/themes/osx/shared.inc
index cf095a5fce58..1e957f2e5eff 100644
--- a/browser/themes/osx/shared.inc
+++ b/browser/themes/osx/shared.inc
@@ -3,9 +3,9 @@
 
 %filter substitution
 
-%define fgTabTexture linear-gradient(transparent, transparent 2px, hsla(0,0%,100%,0.6) 2px, hsla(0,0%,100%,0.6) 3px, hsl(0,0%,99%) 3px, hsl(0,0%,93%))
+%define fgTabTexture linear-gradient(transparent 2px, hsla(0,0%,100%,.6) 2px, hsla(0,0%,100%,.6) 3px, hsl(0,0%,99%) 3px, hsl(0,0%,93%))
 %define toolbarColorLWT rgba(253,253,253,0.45)
-%define fgTabTextureLWT linear-gradient(transparent, transparent 2px, rgba(254,254,254,0.72) 2px, @toolbarColorLWT@)
+%define fgTabTextureLWT linear-gradient(transparent 2px, rgba(254,254,254,.72) 2px, @toolbarColorLWT@)
 %define fgTabBackgroundColor transparent
 %define hudButton -moz-appearance: none; color: #434343; border-radius: 4px; border: 1px solid #b5b5b5; background: linear-gradient(#fff, #f2f2f2); box-shadow: inset 0 1px rgba(255,255,255,.8), inset 0 0 1px rgba(255,255, 255,.25), 0 1px rgba(255,255,255,.3); background-clip: padding-box; background-origin: padding-box; padding: 2px 6px;
 %define hudButtonPressed box-shadow: inset 0 1px 4px -3px #000, 0 1px rgba(255,255,255,.3);
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index ba6b65d3430e..bc407346c8d4 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -138,6 +138,23 @@
   border-style: none;
 }
 
+#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar) {
+  background-clip: padding-box;
+  background-image: linear-gradient(@toolbarHighlight@, @toolbarHighlight@);
+}
+
+@media (-moz-os-version: windows-xp),
+       (-moz-os-version: windows-vista),
+       (-moz-os-version: windows-win7) {
+  #nav-bar {
+    background-image: linear-gradient(@toolbarHighlight@, transparent) !important;
+  }
+
+  #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar) {
+    background-image: none;
+  }
+}
+
 #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) {
   background-color: -moz-Dialog;
 }
@@ -344,11 +361,6 @@
   z-index: 1;
 }
 
-#nav-bar {
-  background-clip: padding-box;
-  background-image: linear-gradient(@toolbarHighlight@, transparent);
-}
-
 #nav-bar {
   border-top: 1px solid @toolbarShadowColor@ !important;
   box-shadow: 0 1px 0 @toolbarHighlight@ inset;
@@ -2004,12 +2016,14 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 /* Invert the unhovered close tab icons on bright-text tabs */
 @media not all and (min-resolution: 1.1dppx) {
+  .tab-close-button:-moz-lwtheme-brighttext,
   #TabsToolbar[brighttext] .tab-close-button:not([visuallyselected="true"]) {
     list-style-image: url("chrome://global/skin/icons/close-inverted.png");
   }
 }
 
 @media (min-resolution: 1.1dppx) {
+  .tab-close-button:-moz-lwtheme-brighttext,
   #TabsToolbar[brighttext] .tab-close-button:not([visuallyselected="true"]) {
     list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
   }
diff --git a/browser/themes/windows/windowsShared.inc b/browser/themes/windows/windowsShared.inc
index d614535a0ee9..4d5bc6939c4b 100644
--- a/browser/themes/windows/windowsShared.inc
+++ b/browser/themes/windows/windowsShared.inc
@@ -4,8 +4,8 @@
 
 %filter substitution
 
-%define toolbarHighlight rgba(253,253,253,0.45)
-%define fgTabTexture linear-gradient(transparent, transparent 2px, rgba(254,254,254,0.72) 2px, rgba(254,254,254,0.72) 2px, rgba(250,250,250,0.88) 3px, rgba(250,250,250,0.88) 3px, rgba(254,254,254,0.72) 4px, rgba(254,254,254,0.72) 4px, @toolbarHighlight@)
+%define toolbarHighlight rgba(255,255,255,.3)
+%define fgTabTexture linear-gradient(transparent 2px, @toolbarHighlight@ 2px, @toolbarHighlight@)
 %define fgTabBackgroundColor -moz-dialog
 %define fgTabTextureLWT @fgTabTexture@
 

From 11d951d56329171f9943c9ee824bb4091981a212 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Tue, 13 Oct 2015 10:32:18 +1100
Subject: [PATCH 4/8] Bug 1212633 - include mobile and unfiled folders in
 Sync's concept of 'all IDs'. r=rnewman

---
 services/sync/modules/engines/bookmarks.js             | 10 +++++++++-
 services/sync/tests/unit/test_bookmark_engine.js       |  8 +++++---
 .../sync/tests/unit/test_bookmark_smart_bookmarks.js   |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/services/sync/modules/engines/bookmarks.js b/services/sync/modules/engines/bookmarks.js
index 135e42f29265..81b96344d398 100644
--- a/services/sync/modules/engines/bookmarks.js
+++ b/services/sync/modules/engines/bookmarks.js
@@ -1352,7 +1352,15 @@ BookmarksStore.prototype = {
 
   getAllIDs: function BStore_getAllIDs() {
     let items = {"menu": true,
-                 "toolbar": true};
+                 "toolbar": true,
+                 "unfiled": true,
+                };
+    // We also want "mobile" but only if a local mobile folder already exists
+    // (otherwise we'll later end up creating it, which we want to avoid until
+    // we actually need it.)
+    if (kSpecialIds.findMobileRoot(false)) {
+      items["mobile"] = true;
+    }
     for each (let guid in kSpecialIds.guids) {
       if (guid != "places" && guid != "tags")
         this._getChildren(guid, items);
diff --git a/services/sync/tests/unit/test_bookmark_engine.js b/services/sync/tests/unit/test_bookmark_engine.js
index bd4c740cbcd3..a27d1b2b63fb 100644
--- a/services/sync/tests/unit/test_bookmark_engine.js
+++ b/services/sync/tests/unit/test_bookmark_engine.js
@@ -227,7 +227,7 @@ add_task(function test_restorePromptsReupload() {
     _("Verify that there's only one bookmark on the server, and it's Thunderbird.");
     // Of course, there's also the Bookmarks Toolbar and Bookmarks Menu...
     let wbos = collection.keys(function (id) {
-      return ["menu", "toolbar", "mobile", folder1_guid].indexOf(id) == -1;
+      return ["menu", "toolbar", "mobile", "unfiled", folder1_guid].indexOf(id) == -1;
     });
     do_check_eq(wbos.length, 1);
     do_check_eq(wbos[0], bmk2_guid);
@@ -257,7 +257,7 @@ add_task(function test_restorePromptsReupload() {
     do_check_true(found);
 
     _("Have the correct number of IDs locally, too.");
-    do_check_eq(count, ["menu", "toolbar", folder1_id, bmk1_id].length);
+    do_check_eq(count, ["menu", "toolbar", "mobile", "unfiled", folder1_id, bmk1_id].length);
 
     _("Sync again. This'll wipe bookmarks from the server.");
     try {
@@ -277,7 +277,9 @@ add_task(function test_restorePromptsReupload() {
     let folderWBOs   = payloads.filter(function (wbo) {
                          return ((wbo.type == "folder") &&
                                  (wbo.id   != "menu") &&
-                                 (wbo.id   != "toolbar"));
+                                 (wbo.id   != "toolbar") &&
+                                 (wbo.id   != "unfiled") &&
+                                 (wbo.id   != "mobile"));
                        });
 
     do_check_eq(bookmarkWBOs.length, 1);
diff --git a/services/sync/tests/unit/test_bookmark_smart_bookmarks.js b/services/sync/tests/unit/test_bookmark_smart_bookmarks.js
index f7758556e3d3..abcf91e07259 100644
--- a/services/sync/tests/unit/test_bookmark_smart_bookmarks.js
+++ b/services/sync/tests/unit/test_bookmark_smart_bookmarks.js
@@ -112,7 +112,7 @@ add_test(function test_annotation_uploaded() {
   try {
     engine.sync();
     let wbos = collection.keys(function (id) {
-                 return ["menu", "toolbar", "mobile"].indexOf(id) == -1;
+                 return ["menu", "toolbar", "mobile", "unfiled"].indexOf(id) == -1;
                });
     do_check_eq(wbos.length, 1);
 

From 17a3d1c4871dfa56208c94b67f898a6ea8ad7339 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Mon, 12 Oct 2015 22:05:38 -0300
Subject: [PATCH 5/8] Bug 1116385. r=Mossop

---
 .../components/prompts/src/CommonDialog.jsm   |  53 ++------
 .../prompts/src/SharedPromptUtils.jsm         | 111 ++++++++++++++++-
 .../downloads/content/unknownContentType.xul  |   1 -
 toolkit/mozapps/downloads/nsHelperAppDlg.js   |  40 ++----
 .../mozapps/downloads/tests/chrome/chrome.ini |   1 +
 .../test_unknownContentType_delayedbutton.xul | 114 ++++++++++++++++++
 6 files changed, 245 insertions(+), 75 deletions(-)
 create mode 100644 toolkit/mozapps/downloads/tests/chrome/test_unknownContentType_delayedbutton.xul

diff --git a/toolkit/components/prompts/src/CommonDialog.jsm b/toolkit/components/prompts/src/CommonDialog.jsm
index 31a107d28e39..f9baed6d49bc 100644
--- a/toolkit/components/prompts/src/CommonDialog.jsm
+++ b/toolkit/components/prompts/src/CommonDialog.jsm
@@ -10,6 +10,9 @@ const Cc = Components.classes;
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "EnableDelayHelper",
+                                  "resource://gre/modules/SharedPromptUtils.jsm");
 
 
 this.CommonDialog = function CommonDialog(args, ui) {
@@ -161,13 +164,11 @@ CommonDialog.prototype = {
         this.setDefaultFocus(true);
 
         if (this.args.enableDelay) {
-            this.setButtonsEnabledState(false);
-            // Use a longer, pref-controlled delay when the dialog is first opened.
-            let delayTime = Services.prefs.getIntPref("security.dialog_enable_delay");
-            this.startOnFocusDelay(delayTime);
-            let self = this;
-            this.ui.focusTarget.addEventListener("blur",  function(e) { self.onBlur(e);  }, false);
-            this.ui.focusTarget.addEventListener("focus", function(e) { self.onFocus(e); }, false);
+            this.delayHelper = new EnableDelayHelper({
+                disableDialog: () => this.setButtonsEnabledState(false),
+                enableDialog: () => this.setButtonsEnabledState(true),
+                focusTarget: this.ui.focusTarget
+            });
         }
 
         // Play a sound (unless we're tab-modal -- don't want those to feel like OS prompts).
@@ -230,44 +231,6 @@ CommonDialog.prototype = {
         this.ui.button3.disabled = !enabled;
     },
 
-    onBlur : function (aEvent) {
-        if (aEvent.target != this.ui.focusTarget)
-            return;
-        this.setButtonsEnabledState(false);
-
-        // If we blur while waiting to enable the buttons, just cancel the
-        // timer to ensure the delay doesn't fire while not focused.
-        if (this.focusTimer) {
-            this.focusTimer.cancel();
-            this.focusTimer = null;
-        }
-    },
-
-    onFocus : function (aEvent) {
-        if (aEvent.target != this.ui.focusTarget)
-            return;
-        this.startOnFocusDelay();
-    },
-
-    startOnFocusDelay : function(delayTime) {
-        // Shouldn't already have a timer, but just in case...
-        if (this.focusTimer)
-            return;
-        // If no delay specified, use 250ms. (This is the normal case for when
-        // after the dialog has been opened and focus shifts.)
-        if (!delayTime)
-            delayTime = 250;
-        let self = this;
-        this.focusTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-        this.focusTimer.initWithCallback(function() { self.onFocusTimeout(); },
-                                         delayTime, Ci.nsITimer.TYPE_ONE_SHOT);
-    },
-
-    onFocusTimeout : function() {
-        this.focusTimer = null;
-        this.setButtonsEnabledState(true);
-    },
-
     setDefaultFocus : function(isInitialLoad) {
         let b = (this.args.defaultButtonNum || 0);
         let button = this.ui["button" + b];
diff --git a/toolkit/components/prompts/src/SharedPromptUtils.jsm b/toolkit/components/prompts/src/SharedPromptUtils.jsm
index 62cfe17f530c..e27ba0189051 100644
--- a/toolkit/components/prompts/src/SharedPromptUtils.jsm
+++ b/toolkit/components/prompts/src/SharedPromptUtils.jsm
@@ -1,10 +1,12 @@
-this.EXPORTED_SYMBOLS = [ "PromptUtils" ];
+this.EXPORTED_SYMBOLS = [ "PromptUtils", "EnableDelayHelper" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
 const Cu = Components.utils;
 
+Cu.import("resource://gre/modules/Services.jsm");
+
 this.PromptUtils = {
     // Fire a dialog open/close event. Used by tabbrowser to focus the
     // tab which is triggering a prompt.
@@ -40,3 +42,110 @@ this.PromptUtils = {
             obj[propName] = propBag.getProperty(propName);
     },
 };
+
+/**
+ * This helper handles the enabling/disabling of dialogs that might
+ * be subject to fast-clicking attacks. It handles the initial delayed
+ * enabling of the dialog, as well as disabling it on blur and reapplying
+ * the delay when the dialog regains focus.
+ *
+ * @param enableDialog   A custom function to be called when the dialog
+ *                       is to be enabled.
+ * @param diableDialog   A custom function to be called when the dialog
+ *                       is to be disabled.
+ * @param focusTarget    The window used to watch focus/blur events.
+ */
+this.EnableDelayHelper = function({enableDialog, disableDialog, focusTarget}) {
+    this.enableDialog = makeSafe(enableDialog);
+    this.disableDialog = makeSafe(disableDialog);
+    this.focusTarget = focusTarget;
+
+    this.disableDialog();;
+
+    this.focusTarget.addEventListener("blur", this, false);
+    this.focusTarget.addEventListener("focus", this, false);
+    this.focusTarget.document.addEventListener("unload", this, false);
+
+    this.startOnFocusDelay();
+};
+
+this.EnableDelayHelper.prototype = {
+    get delayTime() {
+        return Services.prefs.getIntPref("security.dialog_enable_delay");
+    },
+
+    handleEvent : function(event) {
+        if (event.target != this.focusTarget &&
+            event.target != this.focusTarget.document)
+            return;
+
+        switch (event.type) {
+            case "blur":
+                this.onBlur();
+                break;
+
+            case "focus":
+                this.onFocus();
+                break;
+
+            case "unload":
+                this.onUnload();
+                break;
+        }
+    },
+
+    onBlur : function () {
+        this.disableDialog();
+        // If we blur while waiting to enable the buttons, just cancel the
+        // timer to ensure the delay doesn't fire while not focused.
+        if (this._focusTimer) {
+            this._focusTimer.cancel();
+            this._focusTimer = null;
+        }
+    },
+
+    onFocus : function () {
+        this.startOnFocusDelay();
+    },
+
+    onUnload: function() {
+        this.focusTarget.removeEventListener("blur", this, false);
+        this.focusTarget.removeEventListener("focus", this, false);
+        this.focusTarget.document.removeEventListener("unload", this, false);
+
+        if (this._focusTimer) {
+            this._focusTimer.cancel();
+            this._focusTimer = null;
+        }
+
+        this.focusTarget = this.enableDialog = this.disableDialog = null;
+    },
+
+    startOnFocusDelay : function() {
+        if (this._focusTimer)
+            return;
+
+        this._focusTimer = Cc["@mozilla.org/timer;1"]
+                             .createInstance(Ci.nsITimer);
+        this._focusTimer.initWithCallback(
+            () => { this.onFocusTimeout(); },
+            this.delayTime,
+            Ci.nsITimer.TYPE_ONE_SHOT
+        );
+    },
+
+    onFocusTimeout : function() {
+        this._focusTimer = null;
+        this.enableDialog();
+    },
+};
+
+function makeSafe(fn) {
+    return function () {
+        // The dialog could be gone by now (if the user closed it),
+        // which makes it likely that the given fn might throw.
+        try {
+            fn();
+        } catch (e) { }
+    };
+}
diff --git a/toolkit/mozapps/downloads/content/unknownContentType.xul b/toolkit/mozapps/downloads/content/unknownContentType.xul
index 5465ce3e4327..b2dbd0331b89 100644
--- a/toolkit/mozapps/downloads/content/unknownContentType.xul
+++ b/toolkit/mozapps/downloads/content/unknownContentType.xul
@@ -19,7 +19,6 @@
 <dialog id="unknownContentType"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="dialog.initDialog();" onunload="if (dialog) dialog.onCancel();"
-        onblur="if (dialog) dialog.onBlur(event);" onfocus="dialog.onFocus(event);"
 #ifdef XP_WIN
         style="width: 36em;"
 #else
diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js
index cc4903cc0b60..2c2d1ebd472f 100644
--- a/toolkit/mozapps/downloads/nsHelperAppDlg.js
+++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js
@@ -8,6 +8,9 @@
 
 const {utils: Cu, interfaces: Ci, classes: Cc, results: Cr} = Components;
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "EnableDelayHelper",
+                                  "resource://gre/modules/SharedPromptUtils.jsm");
 
 ///////////////////////////////////////////////////////////////////////////////
 //// Helper Functions
@@ -539,25 +542,21 @@ nsUnknownContentTypeDialog.prototype = {
 
     this.mDialog.setTimeout("dialog.postShowCallback()", 0);
 
-    let acceptDelay = Services.prefs.getIntPref("security.dialog_enable_delay");
-    this.mDialog.document.documentElement.getButton("accept").disabled = true;
-    this._showTimer = Components.classes["@mozilla.org/timer;1"]
-                                .createInstance(nsITimer);
-    this._showTimer.initWithCallback(this, acceptDelay, nsITimer.TYPE_ONE_SHOT);
+    this.delayHelper = new EnableDelayHelper({
+      disableDialog: () => {
+        this.mDialog.document.documentElement.getButton("accept").disabled = true;
+      },
+      enableDialog: () => {
+        this.mDialog.document.documentElement.getButton("accept").disabled = false;
+      },
+      focusTarget: this.mDialog
+    });
   },
 
   notify: function (aTimer) {
     if (aTimer == this._showTimer) {
       if (!this.mDialog) {
         this.reallyShow();
-      } else {
-        // The user may have already canceled the dialog.
-        try {
-          if (!this._blurred) {
-            this.mDialog.document.documentElement.getButton("accept").disabled = false;
-          }
-        } catch (ex) {}
-        this._delayExpired = true;
       }
       // The timer won't release us, so we have to release it.
       this._showTimer = null;
@@ -641,21 +640,6 @@ nsUnknownContentTypeDialog.prototype = {
     }
   },
 
-  _blurred: false,
-  _delayExpired: false,
-  onBlur: function(aEvent) {
-    this._blurred = true;
-    this.mDialog.document.documentElement.getButton("accept").disabled = true;
-  },
-
-  onFocus: function(aEvent) {
-    this._blurred = false;
-    if (this._delayExpired) {
-      var script = "document.documentElement.getButton('accept').disabled = false";
-      this.mDialog.setTimeout(script, 250);
-    }
-  },
-
   // Returns true if opening the default application makes sense.
   openWithDefaultOK: function() {
     // The checking is different on Windows...
diff --git a/toolkit/mozapps/downloads/tests/chrome/chrome.ini b/toolkit/mozapps/downloads/tests/chrome/chrome.ini
index 15bdf126dd26..fca44d3b3f6f 100644
--- a/toolkit/mozapps/downloads/tests/chrome/chrome.ini
+++ b/toolkit/mozapps/downloads/tests/chrome/chrome.ini
@@ -36,4 +36,5 @@ skip-if = os != 'win' && toolkit != 'cocoa'
 # disabled for very frequent orange--bug 630567
 skip-if = os != 'win' || true
 [test_ui_stays_open_on_alert_clickback.xul]
+[test_unknownContentType_delayedbutton.xul]
 [test_unknownContentType_dialog_layout.xul]
diff --git a/toolkit/mozapps/downloads/tests/chrome/test_unknownContentType_delayedbutton.xul b/toolkit/mozapps/downloads/tests/chrome/test_unknownContentType_delayedbutton.xul
new file mode 100644
index 000000000000..f4c049664085
--- /dev/null
+++ b/toolkit/mozapps/downloads/tests/chrome/test_unknownContentType_delayedbutton.xul
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<!-- 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/.  -->
+<!--
+ * The unknownContentType popup can have two different layouts depending on
+ * whether a helper application can be selected or not.
+ * This tests that both layouts have correct collapsed elements.
+-->
+
+<window title="Unknown Content Type Dialog Test"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="doTest()">
+
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script type="application/javascript"
+          src="utils.js"/>
+
+  <script type="application/javascript"><![CDATA[
+    Components.utils.import("resource://gre/modules/Services.jsm");
+    Components.utils.import("resource://gre/modules/Task.jsm");
+    Components.utils.import("resource://gre/modules/Promise.jsm");
+
+    const UCT_URI = "chrome://mozapps/content/downloads/unknownContentType.xul";
+    const LOAD_URI = "http://mochi.test:8888/chrome/toolkit/mozapps/downloads/tests/chrome/unknownContentType_dialog_layout_data.txt";
+
+    const DIALOG_DELAY = Services.prefs.getIntPref("security.dialog_enable_delay") + 100;
+
+    let UCTObserver = {
+      opened: Promise.defer(),
+      closed: Promise.defer(),
+
+      observe: function(aSubject, aTopic, aData) {
+        let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget);
+
+        switch (aTopic) {
+          case "domwindowopened":
+            win.addEventListener("load", function onLoad(event) {
+              win.removeEventListener("load", onLoad, false);
+
+              // Let the dialog initialize
+              SimpleTest.executeSoon(function() {
+                UCTObserver.opened.resolve(win);
+              });
+            }, false);
+            break;
+
+          case "domwindowclosed":
+            if (win.location == UCT_URI) {
+              this.closed.resolve();
+            }
+            break;
+        }
+      }
+    };
+
+    Services.ww.registerNotification(UCTObserver);
+    SimpleTest.waitForExplicitFinish();
+
+    function waitDelay(delay) {
+      return new Promise((resolve, reject) => {
+        window.setTimeout(resolve, delay);
+      });
+    }
+
+    function doTest() {
+      Task.spawn(function test_aboutCrashed() {
+        let frame = document.getElementById("testframe");
+        frame.setAttribute("src", LOAD_URI);
+
+        let uctWindow = yield UCTObserver.opened.promise;
+        let ok = uctWindow.document.documentElement.getButton("accept");
+
+        SimpleTest.is(ok.disabled, true, "button started disabled");
+
+        yield waitDelay(DIALOG_DELAY);
+
+        SimpleTest.is(ok.disabled, false, "button was enabled");
+
+        window.focus();
+        yield waitDelay(0);
+
+        SimpleTest.is(ok.disabled, true, "button was disabled");
+
+        uctWindow.focus();
+        yield waitDelay(0);
+
+        SimpleTest.is(ok.disabled, true, "button remained disabled");
+
+        yield waitDelay(DIALOG_DELAY);
+        SimpleTest.is(ok.disabled, false, "button re-enabled after delay");
+
+        uctWindow.document.documentElement.cancelDialog();
+        yield UCTObserver.closed.promise;
+
+        Services.ww.unregisterNotification(UCTObserver);
+        uctWindow = null;
+        UCTObserver = null;
+        SimpleTest.finish();
+      });
+    }
+  ]]></script>
+
+  <body xmlns="http://www.w3.org/1999/xhtml">
+    <p id="display"></p>
+    <div id="content" style="display:none;"></div>
+    <pre id="test"></pre>
+  </body>
+
+  <iframe xmlns="http://www.w3.org/1999/xhtml"
+          id="testframe">
+  </iframe>
+</window>

From 1f586b6e641ce4391f8cd41086c0239458f502d8 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Mon, 12 Oct 2015 22:05:42 -0300
Subject: [PATCH 6/8] Bug 724353. r=Mossop

---
 toolkit/mozapps/handling/content/dialog.js | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/toolkit/mozapps/handling/content/dialog.js b/toolkit/mozapps/handling/content/dialog.js
index 8a58294ac073..324ae534696b 100644
--- a/toolkit/mozapps/handling/content/dialog.js
+++ b/toolkit/mozapps/handling/content/dialog.js
@@ -31,6 +31,10 @@
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cr = Components.results;
+var Cu = Components.utils;
+
+Cu.import("resource://gre/modules/SharedPromptUtils.jsm");
+
 
 var dialog = {
   //////////////////////////////////////////////////////////////////////////////
@@ -41,6 +45,7 @@ var dialog = {
   _itemChoose: null,
   _okButton: null,
   _windowCtxt: null,
+  _buttonDisabled: true,
   
   //////////////////////////////////////////////////////////////////////////////
   //// Methods
@@ -58,8 +63,6 @@ var dialog = {
     this._itemChoose  = document.getElementById("item-choose");
     this._okButton    = document.documentElement.getButton("accept");
 
-    this.updateOKButton();
-
     var description = {
       image: document.getElementById("description-image"),
       text:  document.getElementById("description-text")
@@ -85,6 +88,18 @@ var dialog = {
 
     // UI is ready, lets populate our list
     this.populateList();
+
+    this._delayHelper = new EnableDelayHelper({
+      disableDialog: () => {
+        this._buttonDisabled = true;
+        this.updateOKButton();
+      },
+      enableDialog: () => {
+        this._buttonDisabled = false;
+        this.updateOKButton();
+      },
+      focusTarget: window
+    });
   },
 
  /**
@@ -222,7 +237,8 @@ var dialog = {
   */
   updateOKButton: function updateOKButton()
   {
-    this._okButton.disabled = this._itemChoose.selected;
+    this._okButton.disabled = this._itemChoose.selected ||
+                              this._buttonDisabled;
   },
 
  /**

From 3223175289b9be49c0a097fd71ac12fde74ec2f9 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Mon, 12 Oct 2015 21:37:58 -0700
Subject: [PATCH 7/8] Back out 2 changesets (bug 1116385, bug 724353) for
 test_unknownContentType_delayedbutton.xul failures

Backed out changeset aaade64d3f28 (bug 724353)
Backed out changeset dca478776c91 (bug 1116385)
---
 .../components/prompts/src/CommonDialog.jsm   |  53 ++++++--
 .../prompts/src/SharedPromptUtils.jsm         | 111 +----------------
 .../downloads/content/unknownContentType.xul  |   1 +
 toolkit/mozapps/downloads/nsHelperAppDlg.js   |  40 ++++--
 .../mozapps/downloads/tests/chrome/chrome.ini |   1 -
 .../test_unknownContentType_delayedbutton.xul | 114 ------------------
 toolkit/mozapps/handling/content/dialog.js    |  22 +---
 7 files changed, 78 insertions(+), 264 deletions(-)
 delete mode 100644 toolkit/mozapps/downloads/tests/chrome/test_unknownContentType_delayedbutton.xul

diff --git a/toolkit/components/prompts/src/CommonDialog.jsm b/toolkit/components/prompts/src/CommonDialog.jsm
index f9baed6d49bc..31a107d28e39 100644
--- a/toolkit/components/prompts/src/CommonDialog.jsm
+++ b/toolkit/components/prompts/src/CommonDialog.jsm
@@ -10,9 +10,6 @@ const Cc = Components.classes;
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "EnableDelayHelper",
-                                  "resource://gre/modules/SharedPromptUtils.jsm");
 
 
 this.CommonDialog = function CommonDialog(args, ui) {
@@ -164,11 +161,13 @@ CommonDialog.prototype = {
         this.setDefaultFocus(true);
 
         if (this.args.enableDelay) {
-            this.delayHelper = new EnableDelayHelper({
-                disableDialog: () => this.setButtonsEnabledState(false),
-                enableDialog: () => this.setButtonsEnabledState(true),
-                focusTarget: this.ui.focusTarget
-            });
+            this.setButtonsEnabledState(false);
+            // Use a longer, pref-controlled delay when the dialog is first opened.
+            let delayTime = Services.prefs.getIntPref("security.dialog_enable_delay");
+            this.startOnFocusDelay(delayTime);
+            let self = this;
+            this.ui.focusTarget.addEventListener("blur",  function(e) { self.onBlur(e);  }, false);
+            this.ui.focusTarget.addEventListener("focus", function(e) { self.onFocus(e); }, false);
         }
 
         // Play a sound (unless we're tab-modal -- don't want those to feel like OS prompts).
@@ -231,6 +230,44 @@ CommonDialog.prototype = {
         this.ui.button3.disabled = !enabled;
     },
 
+    onBlur : function (aEvent) {
+        if (aEvent.target != this.ui.focusTarget)
+            return;
+        this.setButtonsEnabledState(false);
+
+        // If we blur while waiting to enable the buttons, just cancel the
+        // timer to ensure the delay doesn't fire while not focused.
+        if (this.focusTimer) {
+            this.focusTimer.cancel();
+            this.focusTimer = null;
+        }
+    },
+
+    onFocus : function (aEvent) {
+        if (aEvent.target != this.ui.focusTarget)
+            return;
+        this.startOnFocusDelay();
+    },
+
+    startOnFocusDelay : function(delayTime) {
+        // Shouldn't already have a timer, but just in case...
+        if (this.focusTimer)
+            return;
+        // If no delay specified, use 250ms. (This is the normal case for when
+        // after the dialog has been opened and focus shifts.)
+        if (!delayTime)
+            delayTime = 250;
+        let self = this;
+        this.focusTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+        this.focusTimer.initWithCallback(function() { self.onFocusTimeout(); },
+                                         delayTime, Ci.nsITimer.TYPE_ONE_SHOT);
+    },
+
+    onFocusTimeout : function() {
+        this.focusTimer = null;
+        this.setButtonsEnabledState(true);
+    },
+
     setDefaultFocus : function(isInitialLoad) {
         let b = (this.args.defaultButtonNum || 0);
         let button = this.ui["button" + b];
diff --git a/toolkit/components/prompts/src/SharedPromptUtils.jsm b/toolkit/components/prompts/src/SharedPromptUtils.jsm
index e27ba0189051..62cfe17f530c 100644
--- a/toolkit/components/prompts/src/SharedPromptUtils.jsm
+++ b/toolkit/components/prompts/src/SharedPromptUtils.jsm
@@ -1,12 +1,10 @@
-this.EXPORTED_SYMBOLS = [ "PromptUtils", "EnableDelayHelper" ];
+this.EXPORTED_SYMBOLS = [ "PromptUtils" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
 const Cu = Components.utils;
 
-Cu.import("resource://gre/modules/Services.jsm");
-
 this.PromptUtils = {
     // Fire a dialog open/close event. Used by tabbrowser to focus the
     // tab which is triggering a prompt.
@@ -42,110 +40,3 @@ this.PromptUtils = {
             obj[propName] = propBag.getProperty(propName);
     },
 };
-
-/**
- * This helper handles the enabling/disabling of dialogs that might
- * be subject to fast-clicking attacks. It handles the initial delayed
- * enabling of the dialog, as well as disabling it on blur and reapplying
- * the delay when the dialog regains focus.
- *
- * @param enableDialog   A custom function to be called when the dialog
- *                       is to be enabled.
- * @param diableDialog   A custom function to be called when the dialog
- *                       is to be disabled.
- * @param focusTarget    The window used to watch focus/blur events.
- */
-this.EnableDelayHelper = function({enableDialog, disableDialog, focusTarget}) {
-    this.enableDialog = makeSafe(enableDialog);
-    this.disableDialog = makeSafe(disableDialog);
-    this.focusTarget = focusTarget;
-
-    this.disableDialog();;
-
-    this.focusTarget.addEventListener("blur", this, false);
-    this.focusTarget.addEventListener("focus", this, false);
-    this.focusTarget.document.addEventListener("unload", this, false);
-
-    this.startOnFocusDelay();
-};
-
-this.EnableDelayHelper.prototype = {
-    get delayTime() {
-        return Services.prefs.getIntPref("security.dialog_enable_delay");
-    },
-
-    handleEvent : function(event) {
-        if (event.target != this.focusTarget &&
-            event.target != this.focusTarget.document)
-            return;
-
-        switch (event.type) {
-            case "blur":
-                this.onBlur();
-                break;
-
-            case "focus":
-                this.onFocus();
-                break;
-
-            case "unload":
-                this.onUnload();
-                break;
-        }
-    },
-
-    onBlur : function () {
-        this.disableDialog();
-        // If we blur while waiting to enable the buttons, just cancel the
-        // timer to ensure the delay doesn't fire while not focused.
-        if (this._focusTimer) {
-            this._focusTimer.cancel();
-            this._focusTimer = null;
-        }
-    },
-
-    onFocus : function () {
-        this.startOnFocusDelay();
-    },
-
-    onUnload: function() {
-        this.focusTarget.removeEventListener("blur", this, false);
-        this.focusTarget.removeEventListener("focus", this, false);
-        this.focusTarget.document.removeEventListener("unload", this, false);
-
-        if (this._focusTimer) {
-            this._focusTimer.cancel();
-            this._focusTimer = null;
-        }
-
-        this.focusTarget = this.enableDialog = this.disableDialog = null;
-    },
-
-    startOnFocusDelay : function() {
-        if (this._focusTimer)
-            return;
-
-        this._focusTimer = Cc["@mozilla.org/timer;1"]
-                             .createInstance(Ci.nsITimer);
-        this._focusTimer.initWithCallback(
-            () => { this.onFocusTimeout(); },
-            this.delayTime,
-            Ci.nsITimer.TYPE_ONE_SHOT
-        );
-    },
-
-    onFocusTimeout : function() {
-        this._focusTimer = null;
-        this.enableDialog();
-    },
-};
-
-function makeSafe(fn) {
-    return function () {
-        // The dialog could be gone by now (if the user closed it),
-        // which makes it likely that the given fn might throw.
-        try {
-            fn();
-        } catch (e) { }
-    };
-}
diff --git a/toolkit/mozapps/downloads/content/unknownContentType.xul b/toolkit/mozapps/downloads/content/unknownContentType.xul
index b2dbd0331b89..5465ce3e4327 100644
--- a/toolkit/mozapps/downloads/content/unknownContentType.xul
+++ b/toolkit/mozapps/downloads/content/unknownContentType.xul
@@ -19,6 +19,7 @@
 <dialog id="unknownContentType"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="dialog.initDialog();" onunload="if (dialog) dialog.onCancel();"
+        onblur="if (dialog) dialog.onBlur(event);" onfocus="dialog.onFocus(event);"
 #ifdef XP_WIN
         style="width: 36em;"
 #else
diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js
index 2c2d1ebd472f..cc4903cc0b60 100644
--- a/toolkit/mozapps/downloads/nsHelperAppDlg.js
+++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js
@@ -8,9 +8,6 @@
 
 const {utils: Cu, interfaces: Ci, classes: Cc, results: Cr} = Components;
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "EnableDelayHelper",
-                                  "resource://gre/modules/SharedPromptUtils.jsm");
 
 ///////////////////////////////////////////////////////////////////////////////
 //// Helper Functions
@@ -542,21 +539,25 @@ nsUnknownContentTypeDialog.prototype = {
 
     this.mDialog.setTimeout("dialog.postShowCallback()", 0);
 
-    this.delayHelper = new EnableDelayHelper({
-      disableDialog: () => {
-        this.mDialog.document.documentElement.getButton("accept").disabled = true;
-      },
-      enableDialog: () => {
-        this.mDialog.document.documentElement.getButton("accept").disabled = false;
-      },
-      focusTarget: this.mDialog
-    });
+    let acceptDelay = Services.prefs.getIntPref("security.dialog_enable_delay");
+    this.mDialog.document.documentElement.getButton("accept").disabled = true;
+    this._showTimer = Components.classes["@mozilla.org/timer;1"]
+                                .createInstance(nsITimer);
+    this._showTimer.initWithCallback(this, acceptDelay, nsITimer.TYPE_ONE_SHOT);
   },
 
   notify: function (aTimer) {
     if (aTimer == this._showTimer) {
       if (!this.mDialog) {
         this.reallyShow();
+      } else {
+        // The user may have already canceled the dialog.
+        try {
+          if (!this._blurred) {
+            this.mDialog.document.documentElement.getButton("accept").disabled = false;
+          }
+        } catch (ex) {}
+        this._delayExpired = true;
       }
       // The timer won't release us, so we have to release it.
       this._showTimer = null;
@@ -640,6 +641,21 @@ nsUnknownContentTypeDialog.prototype = {
     }
   },
 
+  _blurred: false,
+  _delayExpired: false,
+  onBlur: function(aEvent) {
+    this._blurred = true;
+    this.mDialog.document.documentElement.getButton("accept").disabled = true;
+  },
+
+  onFocus: function(aEvent) {
+    this._blurred = false;
+    if (this._delayExpired) {
+      var script = "document.documentElement.getButton('accept').disabled = false";
+      this.mDialog.setTimeout(script, 250);
+    }
+  },
+
   // Returns true if opening the default application makes sense.
   openWithDefaultOK: function() {
     // The checking is different on Windows...
diff --git a/toolkit/mozapps/downloads/tests/chrome/chrome.ini b/toolkit/mozapps/downloads/tests/chrome/chrome.ini
index fca44d3b3f6f..15bdf126dd26 100644
--- a/toolkit/mozapps/downloads/tests/chrome/chrome.ini
+++ b/toolkit/mozapps/downloads/tests/chrome/chrome.ini
@@ -36,5 +36,4 @@ skip-if = os != 'win' && toolkit != 'cocoa'
 # disabled for very frequent orange--bug 630567
 skip-if = os != 'win' || true
 [test_ui_stays_open_on_alert_clickback.xul]
-[test_unknownContentType_delayedbutton.xul]
 [test_unknownContentType_dialog_layout.xul]
diff --git a/toolkit/mozapps/downloads/tests/chrome/test_unknownContentType_delayedbutton.xul b/toolkit/mozapps/downloads/tests/chrome/test_unknownContentType_delayedbutton.xul
deleted file mode 100644
index f4c049664085..000000000000
--- a/toolkit/mozapps/downloads/tests/chrome/test_unknownContentType_delayedbutton.xul
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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/.  -->
-<!--
- * The unknownContentType popup can have two different layouts depending on
- * whether a helper application can be selected or not.
- * This tests that both layouts have correct collapsed elements.
--->
-
-<window title="Unknown Content Type Dialog Test"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="doTest()">
-
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-  <script type="application/javascript"
-          src="utils.js"/>
-
-  <script type="application/javascript"><![CDATA[
-    Components.utils.import("resource://gre/modules/Services.jsm");
-    Components.utils.import("resource://gre/modules/Task.jsm");
-    Components.utils.import("resource://gre/modules/Promise.jsm");
-
-    const UCT_URI = "chrome://mozapps/content/downloads/unknownContentType.xul";
-    const LOAD_URI = "http://mochi.test:8888/chrome/toolkit/mozapps/downloads/tests/chrome/unknownContentType_dialog_layout_data.txt";
-
-    const DIALOG_DELAY = Services.prefs.getIntPref("security.dialog_enable_delay") + 100;
-
-    let UCTObserver = {
-      opened: Promise.defer(),
-      closed: Promise.defer(),
-
-      observe: function(aSubject, aTopic, aData) {
-        let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget);
-
-        switch (aTopic) {
-          case "domwindowopened":
-            win.addEventListener("load", function onLoad(event) {
-              win.removeEventListener("load", onLoad, false);
-
-              // Let the dialog initialize
-              SimpleTest.executeSoon(function() {
-                UCTObserver.opened.resolve(win);
-              });
-            }, false);
-            break;
-
-          case "domwindowclosed":
-            if (win.location == UCT_URI) {
-              this.closed.resolve();
-            }
-            break;
-        }
-      }
-    };
-
-    Services.ww.registerNotification(UCTObserver);
-    SimpleTest.waitForExplicitFinish();
-
-    function waitDelay(delay) {
-      return new Promise((resolve, reject) => {
-        window.setTimeout(resolve, delay);
-      });
-    }
-
-    function doTest() {
-      Task.spawn(function test_aboutCrashed() {
-        let frame = document.getElementById("testframe");
-        frame.setAttribute("src", LOAD_URI);
-
-        let uctWindow = yield UCTObserver.opened.promise;
-        let ok = uctWindow.document.documentElement.getButton("accept");
-
-        SimpleTest.is(ok.disabled, true, "button started disabled");
-
-        yield waitDelay(DIALOG_DELAY);
-
-        SimpleTest.is(ok.disabled, false, "button was enabled");
-
-        window.focus();
-        yield waitDelay(0);
-
-        SimpleTest.is(ok.disabled, true, "button was disabled");
-
-        uctWindow.focus();
-        yield waitDelay(0);
-
-        SimpleTest.is(ok.disabled, true, "button remained disabled");
-
-        yield waitDelay(DIALOG_DELAY);
-        SimpleTest.is(ok.disabled, false, "button re-enabled after delay");
-
-        uctWindow.document.documentElement.cancelDialog();
-        yield UCTObserver.closed.promise;
-
-        Services.ww.unregisterNotification(UCTObserver);
-        uctWindow = null;
-        UCTObserver = null;
-        SimpleTest.finish();
-      });
-    }
-  ]]></script>
-
-  <body xmlns="http://www.w3.org/1999/xhtml">
-    <p id="display"></p>
-    <div id="content" style="display:none;"></div>
-    <pre id="test"></pre>
-  </body>
-
-  <iframe xmlns="http://www.w3.org/1999/xhtml"
-          id="testframe">
-  </iframe>
-</window>
diff --git a/toolkit/mozapps/handling/content/dialog.js b/toolkit/mozapps/handling/content/dialog.js
index 324ae534696b..8a58294ac073 100644
--- a/toolkit/mozapps/handling/content/dialog.js
+++ b/toolkit/mozapps/handling/content/dialog.js
@@ -31,10 +31,6 @@
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cr = Components.results;
-var Cu = Components.utils;
-
-Cu.import("resource://gre/modules/SharedPromptUtils.jsm");
-
 
 var dialog = {
   //////////////////////////////////////////////////////////////////////////////
@@ -45,7 +41,6 @@ var dialog = {
   _itemChoose: null,
   _okButton: null,
   _windowCtxt: null,
-  _buttonDisabled: true,
   
   //////////////////////////////////////////////////////////////////////////////
   //// Methods
@@ -63,6 +58,8 @@ var dialog = {
     this._itemChoose  = document.getElementById("item-choose");
     this._okButton    = document.documentElement.getButton("accept");
 
+    this.updateOKButton();
+
     var description = {
       image: document.getElementById("description-image"),
       text:  document.getElementById("description-text")
@@ -88,18 +85,6 @@ var dialog = {
 
     // UI is ready, lets populate our list
     this.populateList();
-
-    this._delayHelper = new EnableDelayHelper({
-      disableDialog: () => {
-        this._buttonDisabled = true;
-        this.updateOKButton();
-      },
-      enableDialog: () => {
-        this._buttonDisabled = false;
-        this.updateOKButton();
-      },
-      focusTarget: window
-    });
   },
 
  /**
@@ -237,8 +222,7 @@ var dialog = {
   */
   updateOKButton: function updateOKButton()
   {
-    this._okButton.disabled = this._itemChoose.selected ||
-                              this._buttonDisabled;
+    this._okButton.disabled = this._itemChoose.selected;
   },
 
  /**

From 5eb2e6401fd4418969e3b56a7558957a6fd8283f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Tue, 13 Oct 2015 08:25:36 +0200
Subject: [PATCH 8/8] Bug 1208715 - Impose size restriction on extension icons.
 r=jaws

--HG--
extra : rebase_source : 44c99585c1a47225ac2e1601406f119204677865
---
 browser/themes/linux/browser.css   | 30 ++++++++++++++-------
 browser/themes/osx/browser.css     | 29 +++++++++-----------
 browser/themes/windows/browser.css | 43 ++++++++++++------------------
 3 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 8ecb0f0e94ae..ee10efaae762 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -16,7 +16,7 @@
 
 %define forwardTransitionLength 150ms
 %define conditionalForwardWithUrlbar window:not([chromehidden~="toolbar"]) #urlbar-wrapper
-%define conditionalForwardWithUrlbarWidth 30
+%define conditionalForwardWithUrlbarWidth 31
 
 :root {
   --backbutton-urlbar-overlap: 6px;
@@ -576,6 +576,18 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 }
 
 /* Primary toolbar buttons */
+
+.toolbarbutton-1 > .toolbarbutton-icon,
+.toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
+  max-width: 16px;
+}
+
+.toolbarbutton-1:-moz-any(@primaryToolbarButtons@) > .toolbarbutton-icon,
+.toolbarbutton-1:-moz-any(@primaryToolbarButtons@) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
+#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  max-width: 18px;
+}
+
 .findbar-button,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 {
@@ -606,15 +618,11 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   padding: 3px 7px;
 }
 
-/* Help SDK icons fit: */
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon,
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon {
-  width: 16px;
-}
-
-:-moz-any(#TabsToolbar, #nav-bar) toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
-  /* XXXgijs box models strike again: this is 16px + 2 * 7px padding + 2 * 1px border (from the rules above) */
-  width: 32px;
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  /* horizontal padding + border + actual icon width */
+  max-width: 32px;
 }
 
 #nav-bar #PanelUI-menu-button {
@@ -728,6 +736,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 #back-button > .toolbarbutton-icon {
   border-radius: 10000px;
   padding: 6px;
+  max-width: 32px; /* horizontal padding + border + icon width */
 }
 
 #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
@@ -744,6 +753,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
   padding-right: 3px;
   border-left-style: none;
   border-radius: 0;
+  max-width: @conditionalForwardWithUrlbarWidth@px;
 }
 
 @conditionalForwardWithUrlbar@:not([switchingtabs]) > #forward-button {
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index e0a26475b28e..bc306ac1b9fc 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -596,6 +596,18 @@ toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-p
 
 /* ----- PRIMARY TOOLBAR BUTTONS ----- */
 
+.toolbarbutton-1 > .toolbarbutton-icon,
+.toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
+  max-width: 16px;
+  margin: 1px;
+}
+
+.toolbarbutton-1:-moz-any(@primaryToolbarButtons@) > .toolbarbutton-icon,
+.toolbarbutton-1:-moz-any(@primaryToolbarButtons@) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
+  max-width: 18px;
+  margin: 0;
+}
+
 toolbar .toolbarbutton-1:not([type="menu-button"]),
 .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
@@ -1070,12 +1082,6 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-ic
     -moz-image-region: rect(36px, 1440px, 72px, 1404px);
   }
 
-  :-moz-any(@primaryToolbarButtons@) > .toolbarbutton-icon,
-  :-moz-any(@primaryToolbarButtons@) > .toolbarbutton-badge-stack > .toolbarbutton-icon,
-  :-moz-any(@primaryToolbarButtons@) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-    width: 18px;
-  }
-
   #add-share-provider {
     list-style-image: url(chrome://browser/skin/menuPanel-small@2x.png);
     -moz-image-region: rect(0px, 192px, 32px, 160px);
@@ -1087,17 +1093,6 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   min-width: 28px;
 }
 
-/* Help 16px icons fit: */
-toolbar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon {
-  margin: 2px;
-}
-
-/* Help SDK icons fit: */
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon,
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon {
-  width: 16px;
-}
-
 #main-window:not([customizing]) .toolbarbutton-1[disabled="true"] > .toolbarbutton-icon,
 #main-window:not([customizing]) .toolbarbutton-1[disabled="true"] > .toolbarbutton-badge-stack > .toolbarbutton-icon,
 #main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled="true"] > .toolbarbutton-icon {
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index bc407346c8d4..9ca6b455ae1e 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -685,6 +685,17 @@ toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   -moz-margin-end: 0;
 }
 
+.toolbarbutton-1 > .toolbarbutton-icon,
+.toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
+  max-width: 16px;
+}
+
+.toolbarbutton-1:-moz-any(@primaryToolbarButtons@) > .toolbarbutton-icon,
+.toolbarbutton-1:-moz-any(@primaryToolbarButtons@) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
+#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  max-width: 18px;
+}
+
 .findbar-button,
 #nav-bar .toolbarbutton-1,
 #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
@@ -745,20 +756,11 @@ toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   transition-duration: 150ms;
 }
 
-toolbaritem[cui-areatype="toolbar"] > :-moz-any(@nestedButtons@) > .toolbarbutton-icon,
-:-moz-any(@primaryToolbarButtons@):-moz-any([cui-areatype="toolbar"],:not([cui-areatype])):not(:-moz-any(@nestedButtons@)) > .toolbarbutton-icon,
-:-moz-any(@primaryToolbarButtons@):-moz-any([cui-areatype="toolbar"],:not([cui-areatype])) > .toolbarbutton-badge-stack > .toolbarbutton-icon,
-:-moz-any(@primaryToolbarButtons@):-moz-any([cui-areatype="toolbar"],:not([cui-areatype])) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
-  width: 18px;
-}
-
-#nav-bar toolbaritem[cui-areatype="toolbar"] > :-moz-any(@nestedButtons@) > .toolbarbutton-icon,
-#nav-bar :-moz-any(@primaryToolbarButtons@):-moz-any([cui-areatype="toolbar"],:not([cui-areatype])):not(:-moz-any(@nestedButtons@)) > .toolbarbutton-icon,
-#nav-bar :-moz-any(@primaryToolbarButtons@):-moz-any([cui-areatype="toolbar"],:not([cui-areatype])) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 #nav-bar #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   /* horizontal padding + border + actual icon width */
-  width: 32px;
+  max-width: 32px;
 }
 
 @media (-moz-os-version: windows-xp),
@@ -806,17 +808,6 @@ toolbaritem[cui-areatype="toolbar"] > :-moz-any(@nestedButtons@) > .toolbarbutto
   padding: calc(var(--toolbarbutton-vertical-inner-padding) + 1px) 7px;
 }
 
-/* Help SDK icons fit: */
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon,
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon {
-  width: 16px;
-}
-
-#nav-bar toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
-  /* XXXgijs box models strike again: this is 16px + 2 * 7px padding + 2 * 1px border (from the rules above) */
-  width: 32px;
-}
-
 #nav-bar .toolbarbutton-1[type=panel] > .toolbarbutton-icon,
 #nav-bar .toolbarbutton-1[type=panel] > .toolbarbutton-badge-stack,
 #nav-bar .toolbarbutton-1[type=menu]:not(#PanelUI-menu-button):not(#back-button):not(#forward-button) > .toolbarbutton-icon,
@@ -831,7 +822,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 
 #nav-bar #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   /* horizontal padding + border + actual icon width */
-  width: 31px;
+  max-width: 31px;
 }
 
 #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
@@ -952,7 +943,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
   padding-right: 3px !important;
 % icon width + border + horizontal padding without --backbutton-urlbar-overlap
 %define forwardButtonWidth 25
-  width: calc(@forwardButtonWidth@px + var(--backbutton-urlbar-overlap)) !important;
+  max-width: calc(@forwardButtonWidth@px + var(--backbutton-urlbar-overlap)) !important;
 }
 
 @conditionalForwardWithUrlbar@:not([switchingtabs]) > #forward-button {
@@ -994,7 +985,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 #back-button > .toolbarbutton-icon {
   border-radius: 10000px !important;
   padding: 6px !important;
-  width: 32px !important; /* icon width + horizontal padding + border */
+  max-width: 32px !important; /* icon width + horizontal padding + border */
 }
 
 #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {