Bug 1173357 - Use the default application association dialog on Windows 8.1 and earlier when setting the default browser through the Preferences. r=Gijs, a=sledru
authorJared Wein <jwein@mozilla.com>
Thu, 11 Jun 2015 12:20:38 -0400
changeset 275101 09c91f99b007c06aef80cb2e1638b9db031c953a
parent 275100 057ae6427e2252527d88eacccb9522cdc2ff055f
child 275102 af8434af9b4b51d8545737420948d1ad2352bc94
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs, sledru
bugs1173357
milestone40.0a2
Bug 1173357 - Use the default application association dialog on Windows 8.1 and earlier when setting the default browser through the Preferences. r=Gijs, a=sledru
browser/components/preferences/in-content/main.js
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@@ -690,22 +690,24 @@ var gMainPane = {
     * such as Windows have terrible UIs for all filetypes. In those
     * platforms, Firefox only attempts to associate itself with HTML.
     */
    shouldClaimAllTypes: function()
    {
     let claimAllTypes = true;
     try {
       if (AppConstants.platform == "win") {
-        // In Windows 8+, the UI for selecting default protocol is much
+        // In Windows 10+, the UI for selecting default protocol is much
         // nicer than the UI for setting file type associations. So we
-        // only show the protocol association screen on Windows 8+.
-        // Windows 8 is version 6.2.
+        // only show the protocol association screen on Windows 10+.
+        // Windows 8.1 is version 6.3. The startup code still uses
+        // the default protocol dialog, but the preferences is more "advanced"
+        // and as such uses the file type associations.
         let version = Services.sysinfo.getProperty("version");
-        claimAllTypes = (parseFloat(version) < 6.2);
+        claimAllTypes = (parseFloat(version) <= 6.3);
       }
     } catch (ex) {}
     return claimAllTypes;
    },
 
   /**
    * Show button for setting browser as default browser or information that
    * browser is already the default browser.