1195965 - Remove #ifdefs from browser/components/tabview JS files

Status: RESOLVED FIXED

(Firefox Graveyard :: Panorama, defect)

Description

[:Gijs (he/him)]

Hits:

browser/components/tabview/search.js:#ifdef XP_MACOSX
browser/components/tabview/search.js:#endif
browser/components/tabview/search.js:#ifdef XP_MACOSX
browser/components/tabview/search.js:#endif
browser/components/tabview/ui.js:#ifdef XP_MACOSX
browser/components/tabview/ui.js:#endif
browser/components/tabview/ui.js:#ifdef XP_MACOSX
browser/components/tabview/ui.js:#endif
browser/components/tabview/ui.js:#ifdef XP_MACOSX
browser/components/tabview/ui.js:#endif
browser/components/tabview/ui.js:#ifdef XP_UNIX
browser/components/tabview/ui.js:#else
browser/components/tabview/ui.js:#endif
browser/components/tabview/ui.js:#ifdef XP_MACOSX
browser/components/tabview/ui.js:#endif
browser/components/tabview/ui.js:#ifdef XP_UNIX
browser/components/tabview/ui.js:#endif
browser/components/tabview/ui.js:#ifdef XP_MACOSX
browser/components/tabview/ui.js:#endif
browser/components/tabview/ui.js:#ifdef XP_MACOSX
browser/components/tabview/ui.js:#else
browser/components/tabview/ui.js:#endif

All of these are available on AppConstants.jsm

Comment 1

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

Attachment: patch, v1

Comment 2

[:Gijs (he/him)]

Comment on attachment 8650447 [details] [diff] [review]
patch, v1

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

r=me with the nits below fixed & assuming green try

::: browser/components/tabview/search.js
@@ +597,1 @@
>        UI.setTitlebarColors({active: "#717171", inactive: "#EDEDED"});

Nit: It looks like this isn't a diff -w, which means both these lines need indenting

::: browser/components/tabview/ui.js
@@ +988,5 @@
>          if (evt.altKey)
>            return;
>  
> +        if ((AppConstants.platform == "macosx" && evt.metaKey) ||
> +            (!(AppConstants.platform == "macosx") && evt.ctrlKey))

Nit: (AppConstants.platform != "macosx" && evt.ctrlKey)

@@ +989,5 @@
>            return;
>  
> +        if ((AppConstants.platform == "macosx" && evt.metaKey) ||
> +            (!(AppConstants.platform == "macosx") && evt.ctrlKey))
> +        {

Nit: on the previous line at the end, not on its own line

Comment 3

[Pulsebot]

https://hg.mozilla.org/integration/fx-team/rev/14e16174289b

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/14e16174289b