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

Side by Side Diff: chrome/app/theme/theme_resources_2x.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/app/theme/theme_resources_standard.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/theme_resources_2x.h" type="rc_header"> 4 <output filename="grit/theme_resources_2x.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="theme_resources_2x.pak" type="data_package" /> 7 <output filename="theme_resources_2x.pak" type="data_package" />
8 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <includes> 10 <includes>
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 <include name="IDR_LOCATIONBG_C" file="default_100_percent/omnibox_c.png " type="BINDATA" /> 130 <include name="IDR_LOCATIONBG_C" file="default_100_percent/omnibox_c.png " type="BINDATA" />
131 <include name="IDR_LOCATIONBG_L" file="default_100_percent/omnibox_l.png " type="BINDATA" /> 131 <include name="IDR_LOCATIONBG_L" file="default_100_percent/omnibox_l.png " type="BINDATA" />
132 <include name="IDR_LOCATIONBG_R" file="default_100_percent/omnibox_r.png " type="BINDATA" /> 132 <include name="IDR_LOCATIONBG_R" file="default_100_percent/omnibox_r.png " type="BINDATA" />
133 <include name="IDR_LOCATION_BAR_BORDER" file="default_100_percent/omnibo x_border.png" type="BINDATA" /> 133 <include name="IDR_LOCATION_BAR_BORDER" file="default_100_percent/omnibo x_border.png" type="BINDATA" />
134 </if> 134 </if>
135 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="defau lt_200_percent/keyword_search_bubble_c.png" type="BINDATA" /> 135 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="defau lt_200_percent/keyword_search_bubble_c.png" type="BINDATA" />
136 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="defau lt_200_percent/keyword_search_bubble_l.png" type="BINDATA" /> 136 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="defau lt_200_percent/keyword_search_bubble_l.png" type="BINDATA" />
137 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="defau lt_200_percent/keyword_search_bubble_r.png" type="BINDATA" /> 137 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="defau lt_200_percent/keyword_search_bubble_r.png" type="BINDATA" />
138 <include name="IDR_MOBILE" file="default_200_percent/mobile.png" type="BIN DATA" /> 138 <include name="IDR_MOBILE" file="default_200_percent/mobile.png" type="BIN DATA" />
139 <include name="IDR_MOBILE_LIT" file="default_200_percent/mobile_lit.png" t ype="BINDATA" /> 139 <include name="IDR_MOBILE_LIT" file="default_200_percent/mobile_lit.png" t ype="BINDATA" />
140 <if expr="pp_ifdef('toolkit_views')"> 140 <if expr="pp_ifdef('use_ash')">
141 <include name="IDR_NEWTAB_BUTTON" file="default_100_percent/ash/newtab_n ormal.png" type="BINDATA" /> 141 <include name="IDR_NEWTAB_BUTTON" file="default_100_percent/ash/newtab_n ormal.png" type="BINDATA" />
142 <include name="IDR_NEWTAB_BUTTON_H" file="default_100_percent/ash/newtab _hover.png" type="BINDATA" /> 142 <include name="IDR_NEWTAB_BUTTON_H" file="default_100_percent/ash/newtab _hover.png" type="BINDATA" />
143 <include name="IDR_NEWTAB_BUTTON_P" file="default_100_percent/ash/newtab _pressed.png" type="BINDATA" /> 143 <include name="IDR_NEWTAB_BUTTON_P" file="default_100_percent/ash/newtab _pressed.png" type="BINDATA" />
144 <include name="IDR_NEWTAB_BUTTON_MASK" file="default_100_percent/ash/new tab_button_mask.png" type="BINDATA" /> 144 <include name="IDR_NEWTAB_BUTTON_MASK" file="default_100_percent/ash/new tab_button_mask.png" type="BINDATA" />
145 </if> 145 </if>
146 <if expr="not pp_ifdef('toolkit_views')"> 146 <if expr="pp_ifdef('toolkit_views') and not pp_ifdef('use_ash')">
147 <include name="IDR_NEWTAB_BUTTON" file="default_100_percent/newtab_views .png" type="BINDATA" />
148 <include name="IDR_NEWTAB_BUTTON_H" file="default_100_percent/newtab_hov er.png" type="BINDATA" />
149 <include name="IDR_NEWTAB_BUTTON_P" file="default_100_percent/newtab_p_v iews.png" type="BINDATA" />
150 <include name="IDR_NEWTAB_BUTTON_MASK" file="default_100_percent/newtab_ button_mask_views.png" type="BINDATA" />
151 </if>
152 <if expr="not pp_ifdef('toolkit_views') and not pp_ifdef('use_ash')">
147 <include name="IDR_NEWTAB_BUTTON" file="default_200_percent/newtab.png" type="BINDATA" /> 153 <include name="IDR_NEWTAB_BUTTON" file="default_200_percent/newtab.png" type="BINDATA" />
148 <include name="IDR_NEWTAB_BUTTON_H" file="default_200_percent/newtab_hov er.png" type="BINDATA" /> 154 <include name="IDR_NEWTAB_BUTTON_H" file="default_200_percent/newtab_hov er.png" type="BINDATA" />
149 <include name="IDR_NEWTAB_BUTTON_P" file="default_200_percent/newtab_pre ssed.png" type="BINDATA" /> 155 <include name="IDR_NEWTAB_BUTTON_P" file="default_200_percent/newtab_pre ssed.png" type="BINDATA" />
150 <include name="IDR_NEWTAB_BUTTON_MASK" file="default_200_percent/newtab_ button_mask.png" type="BINDATA" /> 156 <include name="IDR_NEWTAB_BUTTON_MASK" file="default_200_percent/newtab_ button_mask.png" type="BINDATA" />
151 </if> 157 </if>
152 <include name="IDR_SETTINGS_FAVICON" file="default_100_percent/settings_fa vicon.png" type="BINDATA" /> 158 <include name="IDR_SETTINGS_FAVICON" file="default_100_percent/settings_fa vicon.png" type="BINDATA" />
153 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="default_200_perce nt/ev_bubble_c.png" type="BINDATA" /> 159 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="default_200_perce nt/ev_bubble_c.png" type="BINDATA" />
154 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="default_200_perce nt/ev_bubble_l.png" type="BINDATA" /> 160 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="default_200_perce nt/ev_bubble_l.png" type="BINDATA" />
155 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="default_200_perce nt/ev_bubble_r.png" type="BINDATA" /> 161 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="default_200_perce nt/ev_bubble_r.png" type="BINDATA" />
156 <include name="IDR_OTR_ICON" file="default_100_percent/otr_icon.png" type= "BINDATA" /> 162 <include name="IDR_OTR_ICON" file="default_100_percent/otr_icon.png" type= "BINDATA" />
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 <if expr="not pp_ifdef('toolkit_views')"> 280 <if expr="not pp_ifdef('toolkit_views')">
275 <include name="IDR_TOOLS" file="default_200_percent/tools.png" type="BIN DATA" /> 281 <include name="IDR_TOOLS" file="default_200_percent/tools.png" type="BIN DATA" />
276 <include name="IDR_TOOLS_H" file="default_200_percent/tools_hover.png" t ype="BINDATA" /> 282 <include name="IDR_TOOLS_H" file="default_200_percent/tools_hover.png" t ype="BINDATA" />
277 <include name="IDR_TOOLS_P" file="default_200_percent/tools_pressed.png" type="BINDATA" /> 283 <include name="IDR_TOOLS_P" file="default_200_percent/tools_pressed.png" type="BINDATA" />
278 </if> 284 </if>
279 <include name="IDR_ZOOM_MINUS" file="default_200_percent/zoom_minus.png" t ype="BINDATA" /> 285 <include name="IDR_ZOOM_MINUS" file="default_200_percent/zoom_minus.png" t ype="BINDATA" />
280 <include name="IDR_ZOOM_PLUS" file="default_200_percent/zoom_plus.png" typ e="BINDATA" /> 286 <include name="IDR_ZOOM_PLUS" file="default_200_percent/zoom_plus.png" typ e="BINDATA" />
281 </includes> 287 </includes>
282 </release> 288 </release>
283 </grit> 289 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/theme/theme_resources_standard.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698