summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-24 12:33:55 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-24 12:33:55 +0000
commit8e138e6bdf8ab940311dd14ff8ca15c6961a5958 (patch)
tree4bf9eb1510f32ee2259ee263eecfaf0e69032fec /chrome/app
parentdfdb84ba1e1735b0000d1243e765c169bbbe54b0 (diff)
downloadchromium_src-8e138e6bdf8ab940311dd14ff8ca15c6961a5958.zip
chromium_src-8e138e6bdf8ab940311dd14ff8ca15c6961a5958.tar.gz
chromium_src-8e138e6bdf8ab940311dd14ff8ca15c6961a5958.tar.bz2
Remove touch resources from gyp/grd files.
BUG=none R=girard@chromium.org TBR=thestig@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=244822 Review URL: https://codereview.chromium.org/132453003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/theme/theme_resources.grd10
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 598c75af..16f4c3d 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -18,9 +18,6 @@
<output filename="grit/theme_resources_map.h" type="resource_map_header" context="default_100_percent" />
<output filename="theme_resources_100_percent.pak" type="data_package" context="default_100_percent" />
<output filename="theme_resources_200_percent.pak" type="data_package" context="default_200_percent" />
- <output filename="theme_resources_touch_100_percent.pak" type="data_package" context="touch_100_percent" />
- <output filename="theme_resources_touch_140_percent.pak" type="data_package" context="touch_140_percent" />
- <output filename="theme_resources_touch_180_percent.pak" type="data_package" context="touch_180_percent" />
</outputs>
<release seq="1">
<structures fallback_to_low_resolution="true">
@@ -621,12 +618,7 @@
<if expr="(is_macosx or is_ios) and not pp_ifdef('toolkit_views')">
<structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="mac/otr_icon.png" />
</if>
- <if expr="context.startswith('default_')">
- <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" file="common/otr_icon.png" />
- </if>
- <if expr="not context.startswith('default_')">
- <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" file="otr_icon_fullscreen.png" />
- </if>
+ <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" file="common/otr_icon.png" />
<structure type="chrome_scaled_image" name="IDR_OVERLAY_DROP_SHADOW" file="common/overlay_drop_shadow.png" />
<structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="pageinfo_bad.png" />
<structure type="chrome_scaled_image" name="IDR_PAGEINFO_GOOD" file="pageinfo_good.png" />