fix locales for linux but desktop_linux=0

fix locales for linux but desktop_linux=0

Fixup after https://codereview.chromium.org/146963007 for non desktop
linux.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=287018

[Mostyn Bramley-Moore, 2014-07-31 13:30:15]

@r.c. landan: I think this previous CL broke my non-desktop linux build:
https://codereview.chromium.org/146963007

Do you set desktop_linux=1 on BSD?

[r.c.ladan, 2014-07-31 13:45:37]

desktop_linux is set in build/common.gypi for Linux, FreeBSD, OpenBSD, and
Solaris if ChromeOS is unset.

https://codereview.chromium.org/431993002/diff/1/ui/strings/app_locale_settin...
File ui/strings/app_locale_settings.grd (right):

https://codereview.chromium.org/431993002/diff/1/ui/strings/app_locale_settin...
ui/strings/app_locale_settings.grd:232: <if expr="(is_linux or is_android) and
not chromeos">
I think it is better to use 

<if expr="(pp_ifdef('desktop_linux') or is_android) and not chromeos">

here?

[Mostyn Bramley-Moore, 2014-07-31 13:59:05]

> desktop_linux is set in build/common.gypi for Linux, FreeBSD, OpenBSD, and
Solaris if ChromeOS is unset.

Perhaps we should rename desktop_linux to desktop_unix?

https://codereview.chromium.org/431993002/diff/1/ui/strings/app_locale_settin...
File ui/strings/app_locale_settings.grd (right):

https://codereview.chromium.org/431993002/diff/1/ui/strings/app_locale_settin...
ui/strings/app_locale_settings.grd:232: <if expr="(is_linux or is_android) and
not chromeos">
On 2014/07/31 13:45:36, r.c.ladan wrote:
> I think it is better to use 
> 
> <if expr="(pp_ifdef('desktop_linux') or is_android) and not chromeos">
> 
> here?

That breaks my non-desktop linux build.

How about "(is_linux or is_android or is_bsd) and not chromeos" ?

[r.c.ladan, 2014-07-31 14:00:59]

On 2014/07/31 13:59:05, Mostyn Bramley-Moore wrote:
> > desktop_linux is set in build/common.gypi for Linux, FreeBSD, OpenBSD, and
> Solaris if ChromeOS is unset.
> 
> Perhaps we should rename desktop_linux to desktop_unix?
> 
Probably ;) Tony?

>
https://codereview.chromium.org/431993002/diff/1/ui/strings/app_locale_settin...
> File ui/strings/app_locale_settings.grd (right):
> 
>
https://codereview.chromium.org/431993002/diff/1/ui/strings/app_locale_settin...
> ui/strings/app_locale_settings.grd:232: <if expr="(is_linux or is_android) and
> not chromeos">
> On 2014/07/31 13:45:36, r.c.ladan wrote:
> > I think it is better to use 
> > 
> > <if expr="(pp_ifdef('desktop_linux') or is_android) and not chromeos">
> > 
> > here?
> 
> That breaks my non-desktop linux build.
> 
> How about "(is_linux or is_android or is_bsd) and not chromeos" ?

That should work for the BSD cases.

[Mostyn Bramley-Moore, 2014-07-31 14:13:23]

https://codereview.chromium.org/431993002/diff/1/ui/strings/app_locale_settin...
File ui/strings/app_locale_settings.grd (right):

https://codereview.chromium.org/431993002/diff/1/ui/strings/app_locale_settin...
ui/strings/app_locale_settings.grd:232: <if expr="(is_linux or is_android) and
not chromeos">
On 2014/07/31 13:59:05, Mostyn Bramley-Moore wrote:
> On 2014/07/31 13:45:36, r.c.ladan wrote:
> > I think it is better to use 
> > 
> > <if expr="(pp_ifdef('desktop_linux') or is_android) and not chromeos">
> > 
> > here?
> 
> That breaks my non-desktop linux build.
> 
> How about "(is_linux or is_android or is_bsd) and not chromeos" ?

Done in patchset 2.

[Mostyn Bramley-Moore, 2014-07-31 19:28:18]

@tony: how does this look to you?

[tony, 2014-07-31 20:47:48]

LGTM!

[Mostyn Bramley-Moore, 2014-07-31 20:49:16]

The CQ bit was checked by mostynb@opera.com

[commit-bot: I haz the power, 2014-07-31 20:50:17]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mostynb@opera.com/431993002/20001

[commit-bot: I haz the power, 2014-08-01 16:22:05]

Change committed as 287018