Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(177)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/theme/theme_resources_touch_1x.grd

Issue 10544117: Make new tab button color match inactive tab (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update 2x, touch_1x, touch_2 Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/theme/theme_resources_standard.grd ('k') | chrome/app/theme/theme_resources_touch_2x.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/theme/theme_resources_touch_1x.grd
diff --git a/chrome/app/theme/theme_resources_touch_1x.grd b/chrome/app/theme/theme_resources_touch_1x.grd
index 8aa0d8ed9fbb228b1d31edcfaf02b3e990572494..530f7f25d1635932b8a362960cd6f2899abf8ed7 100644
--- a/chrome/app/theme/theme_resources_touch_1x.grd
+++ b/chrome/app/theme/theme_resources_touch_1x.grd
@@ -137,13 +137,19 @@
<include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="touch_100_percent/keyword_search_bubble_r.png" type="BINDATA" />
<include name="IDR_MOBILE" file="touch_100_percent/mobile.png" type="BINDATA" />
<include name="IDR_MOBILE_LIT" file="touch_100_percent/mobile_lit.png" type="BINDATA" />
- <if expr="pp_ifdef('toolkit_views')">
+ <if expr="pp_ifdef('use_ash')">
<include name="IDR_NEWTAB_BUTTON" file="touch_100_percent/newtab_normal.png" type="BINDATA" />
<include name="IDR_NEWTAB_BUTTON_H" file="touch_100_percent/newtab_hover.png" type="BINDATA" />
<include name="IDR_NEWTAB_BUTTON_P" file="touch_100_percent/newtab_pressed.png" type="BINDATA" />
<include name="IDR_NEWTAB_BUTTON_MASK" file="touch_100_percent/newtab_button_mask.png" type="BINDATA" />
</if>
- <if expr="not pp_ifdef('toolkit_views')">
+ <if expr="pp_ifdef('toolkit_views') and not pp_ifdef('use_ash')">
+ <include name="IDR_NEWTAB_BUTTON" file="touch_100_percent/newtab_normal.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_H" file="touch_100_percent/newtab_hover.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_P" file="touch_100_percent/newtab_pressed.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_MASK" file="touch_100_percent/newtab_button_mask.png" type="BINDATA" />
+ </if>
+ <if expr="not pp_ifdef('toolkit_views') and not pp_ifdef('use_ash')">
<include name="IDR_NEWTAB_BUTTON" file="default_100_percent/newtab.png" type="BINDATA" />
<include name="IDR_NEWTAB_BUTTON_H" file="default_100_percent/newtab_hover.png" type="BINDATA" />
<include name="IDR_NEWTAB_BUTTON_P" file="default_100_percent/newtab_pressed.png" type="BINDATA" />
« no previous file with comments | « chrome/app/theme/theme_resources_standard.grd ('k') | chrome/app/theme/theme_resources_touch_2x.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698