summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-27 03:37:24 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-27 03:37:24 +0000
commitfe9e400abf019d5e2491ae0603803afb1dc724b7 (patch)
treeda5dd417c064337ba87fb7a8ff20416774edc47a
parent1d88789a5e2dc455123ef71b14d9bbc45c660290 (diff)
downloadchromium_src-fe9e400abf019d5e2491ae0603803afb1dc724b7.zip
chromium_src-fe9e400abf019d5e2491ae0603803afb1dc724b7.tar.gz
chromium_src-fe9e400abf019d5e2491ae0603803afb1dc724b7.tar.bz2
Split touch and HiDPI newtab icons (non-binary part)
This is the non-binary part of this CL: http://codereview.chromium.org/8038043/ BUG=96009 TEST= Review URL: http://codereview.chromium.org/8055001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102881 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/theme/theme_resources_large.grd16
1 files changed, 12 insertions, 4 deletions
diff --git a/chrome/app/theme/theme_resources_large.grd b/chrome/app/theme/theme_resources_large.grd
index a43d946..f635462 100644
--- a/chrome/app/theme/theme_resources_large.grd
+++ b/chrome/app/theme/theme_resources_large.grd
@@ -86,10 +86,18 @@
<include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="large_keyword_search_bubble_c.png" type="BINDATA" />
<include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="large_keyword_search_bubble_l.png" type="BINDATA" />
<include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="large_keyword_search_bubble_r.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON" file="large_newtab.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_H" file="large_newtab_h.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_MASK" file="large_newtab_button_mask.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_P" file="large_newtab_p.png" type="BINDATA" />
+ <if expr="not pp_ifdef('touchui')">
+ <include name="IDR_NEWTAB_BUTTON" file="large_newtab.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_H" file="large_newtab_h.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_MASK" file="large_newtab_button_mask.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_P" file="large_newtab_p.png" type="BINDATA" />
+ </if>
+ <if expr="pp_ifdef('touchui')">
+ <include name="IDR_NEWTAB_BUTTON" file="touch_newtab.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_H" file="touch_newtab_h.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_MASK" file="touch_newtab_button_mask.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_P" file="touch_newtab_p.png" type="BINDATA" />
+ </if>
<include name="IDR_SETTINGS_FAVICON" file="large_settings_favicon.png" type="BINDATA" />
<include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="large_ev_bubble_c.png" type="BINDATA" />
<include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="large_ev_bubble_l.png" type="BINDATA" />