1195962 - Remove #ifdefs from browser/components/uitour JS files

Status: RESOLVED FIXED

(Firefox :: Tours, defect)

Description

[:Gijs (he/him)]

Hits:

browser/components/uitour/UITour.jsm:#ifdef XP_LINUX
browser/components/uitour/UITour.jsm:#endif
browser/components/uitour/UITour.jsm:#ifdef XP_LINUX
browser/components/uitour/UITour.jsm:#endif
browser/components/uitour/UITour.jsm:#ifdef MOZ_SERVICES_HEALTHREPORT
browser/components/uitour/UITour.jsm:#endif
browser/components/uitour/UITour.jsm:#ifdef MOZ_SERVICES_HEALTHREPORT
browser/components/uitour/UITour.jsm:#endif

All of these are available on AppConstants.jsm

Comment 1

[Mark Banner (:standard8)]

With the fixes in comment 0 applied, it'd also be good to change moz.build for UITour.jsm from EXTRA_PP_JS_MODULES to EXTRA_JS_MODULES - as the need for preprocessing will have been eradicated.

Comment 2

[Robert Helmer [:rhelmer]]

Attachment: MozReview Request: bug 1195962 - replace #ifdef with AppConstants.jsm in UITour.jsm r=Gijs

bug 1195962 - replace #ifdef with AppConstants.jsm

Comment 3

[Robert Helmer [:rhelmer]]

https://reviewboard.mozilla.org/r/16951/#review15041

::: browser/components/uitour/UITour.jsm:2191
(Diff revision 1)
> +function UITourTreatmentMeasurement1() {

UITourTreatmentMeasurement1() was moved to top-level because strict mode doesn't allow nesting functions, unless it's immediately following a top-level function definition - it was top-level before because of the #ifdef but is now inside a regular "if" block.

Comment 4

[:Gijs (he/him)]

Comment on attachment 8651532 [details]
MozReview Request: bug 1195962 - replace #ifdef with AppConstants.jsm in UITour.jsm r=Gijs

https://reviewboard.mozilla.org/r/16953/#review15047

Ship It!

Comment 5

[Robert Helmer [:rhelmer]]

Comment on attachment 8651532 [details]
MozReview Request: bug 1195962 - replace #ifdef with AppConstants.jsm in UITour.jsm r=Gijs

bug 1195962 - replace #ifdef with AppConstants.jsm in UITour.jsm r=Gijs

Comment 6

[Robert Helmer [:rhelmer]]

Comment on attachment 8651532 [details]
MozReview Request: bug 1195962 - replace #ifdef with AppConstants.jsm in UITour.jsm r=Gijs

Just changed the commit message to indicate that this is just for UITour.jsm

Comment 7

[Pulsebot]

https://hg.mozilla.org/integration/fx-team/rev/6076aea051ab

Comment 8

[Ryan VanderMeulen (PTO, back July 27)]

https://hg.mozilla.org/mozilla-central/rev/6076aea051ab