ui/gfx/gfx_resources.grd - Issue 7313017: Convert remaining instances of the 'os' variable in grit conditions

Side by Side Diff: ui/gfx/gfx_resources.grd

Issue 7313017: Convert remaining instances of the 'os' variable in grit conditions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « ui/base/strings/app_locale_settings.grd ('k') | no next file » | no next file with comments »

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <grit latest_public_release="0" current_release="1">	2 <grit latest_public_release="0" current_release="1">

3 <outputs>	3 <outputs>

4 <output filename="grit/gfx_resources.h" type="rc_header">	4 <output filename="grit/gfx_resources.h" type="rc_header">

5 <emit emit_type='prepend'></emit>	5 <emit emit_type='prepend'></emit>

6 </output>	6 </output>

7 <output filename="grit/gfx_resources_map.cc" type="resource_map_source" />	7 <output filename="grit/gfx_resources_map.cc" type="resource_map_source" />

8 <output filename="grit/gfx_resources_map.h" type="resource_map_header" />	8 <output filename="grit/gfx_resources_map.h" type="resource_map_header" />

9 <output filename="gfx_resources.pak" type="data_package" />	9 <output filename="gfx_resources.pak" type="data_package" />

10 <output filename="gfx_resources.rc" type="rc_all" />	10 <output filename="gfx_resources.rc" type="rc_all" />

11 </outputs>	11 </outputs>

12 <release seq="1">	12 <release seq="1">

13 <includes>	13 <includes>

14 <if expr="os.find('win') != -1">	14 <if expr="is_win">

15 <!-- IDR_BITMAP_BRUSH_IMAGE is for canvas_direct2d_unittest on win -->	15 <!-- IDR_BITMAP_BRUSH_IMAGE is for canvas_direct2d_unittest on win -->

16 <!-- TODO(sky): we don't want a test only image in the release builds -- >	16 <!-- TODO(sky): we don't want a test only image in the release builds -- >

17 <include name="IDR_BITMAP_BRUSH_IMAGE" file="resources\bitmap_brush_imag e.png" type="BINDATA" />	17 <include name="IDR_BITMAP_BRUSH_IMAGE" file="resources\bitmap_brush_imag e.png" type="BINDATA" />

18 <include name="IDR_COMPOSITOR_FX" file="resources\compositor.fx" type="B INDATA" />	18 <include name="IDR_COMPOSITOR_FX" file="resources\compositor.fx" type="B INDATA" />

19 <include name="IDR_BLUR_FX" file="resources\blur.fx" type="BINDATA" />	19 <include name="IDR_BLUR_FX" file="resources\blur.fx" type="BINDATA" />

20 </if>	20 </if>

21	21

22 <if expr="is_posix and not is_macosx">	22 <if expr="is_posix and not is_macosx">

23 <include name="IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE" file="resource s\linux-checkbox-disabled-indeterminate.png" type="BINDATA" />	23 <include name="IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE" file="resource s\linux-checkbox-disabled-indeterminate.png" type="BINDATA" />

24 <include name="IDR_LINUX_CHECKBOX_DISABLED_OFF" file="resources\linux-ch eckbox-disabled-off.png" type="BINDATA" />	24 <include name="IDR_LINUX_CHECKBOX_DISABLED_OFF" file="resources\linux-ch eckbox-disabled-off.png" type="BINDATA" />

(...skipping 23 matching lines...) Expand all Loading...
48 <include name="IDR_SCROLL_BACKGROUND_BORDER_UP" file="resources\chromeos _scroll_background_border_up.png" type="BINDATA" />	48 <include name="IDR_SCROLL_BACKGROUND_BORDER_UP" file="resources\chromeos _scroll_background_border_up.png" type="BINDATA" />

49 <include name="IDR_SCROLL_BACKGROUND_BORDER_DOWN" file="resources\chrome os_scroll_background_border_down.png" type="BINDATA" />	49 <include name="IDR_SCROLL_BACKGROUND_BORDER_DOWN" file="resources\chrome os_scroll_background_border_down.png" type="BINDATA" />

50 <include name="IDR_SCROLL_THUMB" file="resources\chromeos_scroll_thumb.p ng" type="BINDATA" />	50 <include name="IDR_SCROLL_THUMB" file="resources\chromeos_scroll_thumb.p ng" type="BINDATA" />

51 <include name="IDR_SCROLL_THUMB_H" file="resources\chromeos_scroll_thumb _h.png" type="BINDATA" />	51 <include name="IDR_SCROLL_THUMB_H" file="resources\chromeos_scroll_thumb _h.png" type="BINDATA" />

52 <include name="IDR_SCROLL_THUMB_P" file="resources\chromeos_scroll_thumb _p.png" type="BINDATA" />	52 <include name="IDR_SCROLL_THUMB_P" file="resources\chromeos_scroll_thumb _p.png" type="BINDATA" />

53 </if>	53 </if>

54 </includes>	54 </includes>

55 </release>	55 </release>

56 </grit>	56 </grit>

57	57

OLD	NEW