1760364 - add shouldShowFocusPromo or similar to BrowserUtils

Status: RESOLVED FIXED

(Firefox :: Messaging System, enhancement, P1)

Description

[Dan Mosedale (:dmosedale, :dmose)]

We need something very very similar to shouldShowVPNPromo for Firefox focus, but with different default lists, because the countries where it's allowed are different (everywhere except china).

We should be able to share the vast majority of the code.

Comment 1

[Punam Dahiya [:pdahiya]]

shouldShowVPNPromo checks for

  vpnPromoEnabled &&
  !avoidAdsCountries.has(homeRegion.toLowerCase()) &&
  !avoidAdsCountries.has(currentRegion.toLowerCase()) &&
  inSupportedRegion &&
  noActivePolicy

shouldShowFocusPromo needs all the checks except 'inSupportedRegion' https://searchfox.org/mozilla-central/source/toolkit/modules/BrowserUtils.jsm#317.

We should expose method shouldShowPromo(promoType) inside BrowserUtils that calls 'shouldShowVPNPromo' or 'shouldShowFocusPromo' based off promoType.

shouldShowPromo should be called from aboutPrivateBrowsing.js passing promoType value from config JSON (either using id or use new promoType property), replacing check shouldShowVPNPromo.

https://searchfox.org/mozilla-central/rev/7d379061bd56251df911728686c378c5820513d8/browser/components/newtab/lib/OnboardingMessageProvider.jsm#41

https://searchfox.org/mozilla-central/source/browser/components/privatebrowsing/content/aboutPrivateBrowsing.js#237

Comment 2

[Dan Mosedale (:dmosedale, :dmose)]

Attachment: WIP: Bug 1760364 - implement shouldShowFocusPromo

Comment 3

[Dan Mosedale (:dmosedale, :dmose)]

Attachment: Bug 1760364 - implement shouldShowFocusPromo, r=Gijs,mviar

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/b4d616f9657a
implement shouldShowFocusPromo, r=Gijs,mviar

Comment 5

[Narcis Beleuzu [:NarcisB]]

Backed out for bc failures on browser_backforward_userinteraction.js

Backout link: https://hg.mozilla.org/integration/autoland/rev/c52a10ef03a3212d2dd0326b3c41d1bb39c723d2
Log link: https://treeherder.mozilla.org/logviewer?job_id=372896451&repo=autoland&lineNumber=10961

Comment 6

[Dan Mosedale (:dmosedale, :dmose)]

One code stanza was incorrectly deleted by my patch. I've put it back and will re-land. Sorry for the inconvenience.

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/3e061741cd1c
implement shouldShowFocusPromo, r=Gijs,mviar

Comment 8

[Norisz Fay [:noriszfay]]

https://hg.mozilla.org/mozilla-central/rev/3e061741cd1c