summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-07 22:27:45 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-07 22:27:45 +0000
commit722fe2fda5e19985413c9f492cf93b7fc902354e (patch)
treeaca1f057ef446a7c8a88f58a5a360742fdc423a0 /ui
parente8d0ddb23bbdc5c07e1979bdd68bb24690d09c95 (diff)
downloadchromium_src-722fe2fda5e19985413c9f492cf93b7fc902354e.zip
chromium_src-722fe2fda5e19985413c9f492cf93b7fc902354e.tar.gz
chromium_src-722fe2fda5e19985413c9f492cf93b7fc902354e.tar.bz2
Convert remaining instances of the 'os' variable in grit conditions
to the new easier to read variables. BUG=none TEST=Manual, everything still compiles. Review URL: http://codereview.chromium.org/7313017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/base/strings/app_locale_settings.grd2
-rw-r--r--ui/gfx/gfx_resources.grd2
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/base/strings/app_locale_settings.grd b/ui/base/strings/app_locale_settings.grd
index 649039b..0661a56 100644
--- a/ui/base/strings/app_locale_settings.grd
+++ b/ui/base/strings/app_locale_settings.grd
@@ -210,7 +210,7 @@
Linux fonts do not have the issue Windows fonts for some locales
(Indian) have. In that case, this need to be enclosed
by platform-dependent if-clause. -->
- <if expr="os == 'win32'">
+ <if expr="is_win">
<message name="IDS_UI_FONT_FAMILY" use_name_for_id="true">
default
</message>
diff --git a/ui/gfx/gfx_resources.grd b/ui/gfx/gfx_resources.grd
index 8d95417..297b0a8 100644
--- a/ui/gfx/gfx_resources.grd
+++ b/ui/gfx/gfx_resources.grd
@@ -11,7 +11,7 @@
</outputs>
<release seq="1">
<includes>
- <if expr="os.find('win') != -1">
+ <if expr="is_win">
<!-- IDR_BITMAP_BRUSH_IMAGE is for canvas_direct2d_unittest on win -->
<!-- TODO(sky): we don't want a test only image in the release builds -->
<include name="IDR_BITMAP_BRUSH_IMAGE" file="resources\bitmap_brush_image.png" type="BINDATA" />