1225648 - Remove duplicate skipDefaultBrowser code and fix double-counting error when tracking prompt counts

Status: VERIFIED FIXED

(Firefox :: Shell Integration, defect)

Description

[Jared Wein [:jaws] (please needinfo? me)]

We currently are duplicating the logic of the skip-default-browser-dialog code across the nsWindowsShellService, nsGnomeShellService, and nsMacShellService. Moving this logic to nsBrowserGlue will remove the duplication.

Also, we were previously incrementing browser.shell.defaultBrowserCheckCount pref in the shell services as well as within nsBrowserGlue, though the one in nsBrowserGlue was more conservative as it only incremented if recovery wasn't activated and if the browser wasn't already set as default.

Comment 1

[Jared Wein [:jaws] (please needinfo? me)]

Attachment: Patch

Comment 2

[:Gijs (he/him)]

Comment on attachment 8688684 [details] [diff] [review]
Patch

Review of attachment 8688684 [details] [diff] [review]:
-----------------------------------------------------------------

::: browser/components/nsBrowserGlue.js
@@ +1309,5 @@
>        }
>  
> +      let willPrompt = shouldCheck &&
> +                       !isDefault &&
> +                       !willRecoverSession;

Nit: I don't think you need to touch this line, right?

::: browser/components/shell/nsIShellService.idl
@@ -50,5 @@
> -   * Used to determine whether or not the "Set Default Browser" check
> -   * should be skipped during first-run or after the browser has been
> -   * run a few times.
> -   */
> -  readonly attribute boolean shouldSkipCheckDefaultBrowser;

This probably needs an idl rev.

Comment 3

[Jared Wein [:jaws] (please needinfo? me)]

Yeah I didn't need to touch that line. I made a change there while working on the patch then moved some code around again and didn't undo the change. Thanks for catching the IDL rev.

Comment 4

[Jared Wein [:jaws] (please needinfo? me)]

https://hg.mozilla.org/integration/fx-team/rev/082c30f30fb573f6d51c969c2f4efa439860068f
Bug 1225648 - Remove duplicate skipDefaultBrowser code and fix double-counting error when tracking prompt counts. r=Gijs

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/082c30f30fb5

Comment 6

[Vasilica Tamas, QA [:vtamas]]

I was able to reproduce this issue on Firefox 45.0a1 (2015-11-17) under Windows 10 64-bit.

Verified fixed on Firefox 45.0a1 (2015-12-09), Firefox 46.0a2 (2016-02-22) and Firefox 47.0a1 (2016-02-22) under Windows 10 64-bit, Ubuntu 12.04 32-bit and Mac OS X 10.9.5. The default browser dialog successfully appears for 3 consecutive browser runs, except the first one.