From 8e138e6bdf8ab940311dd14ff8ca15c6961a5958 Mon Sep 17 00:00:00 2001
From: "oshima@chromium.org"
 <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 24 Jan 2014 12:33:55 +0000
Subject: 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
---
 chrome/app/theme/theme_resources.grd | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'chrome/app')

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" />
-- 
cgit v1.1