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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/app/theme/theme_resources_standard.grd

Issue 10217014: Ash: New assets for toolbar icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 | « chrome/app/theme/theme_resources_metro_1x.grd ('k') | ui/resources/aura/textbutton_hot_bottom.png » ('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_standard.h" type="rc_header"> 4 <output filename="grit/theme_resources_standard.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/theme_resources_standard_map.cc" type="resource_map_s ource" /> 7 <output filename="grit/theme_resources_standard_map.cc" type="resource_map_s ource" />
8 <output filename="grit/theme_resources_standard_map.h" type="resource_map_he ader" /> 8 <output filename="grit/theme_resources_standard_map.h" type="resource_map_he ader" />
9 <output filename="theme_resources_standard.pak" type="data_package" /> 9 <output filename="theme_resources_standard.pak" type="data_package" />
10 <output filename="theme_resources_standard.rc" type="rc_all" /> 10 <output filename="theme_resources_standard.rc" type="rc_all" />
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 <include name="IDR_TAB_ALPHA_LEFT" file="ash/tab_alpha_left.png" type="B INDATA" /> 199 <include name="IDR_TAB_ALPHA_LEFT" file="ash/tab_alpha_left.png" type="B INDATA" />
200 <include name="IDR_TAB_ALPHA_RIGHT" file="ash/tab_alpha_right.png" type= "BINDATA" /> 200 <include name="IDR_TAB_ALPHA_RIGHT" file="ash/tab_alpha_right.png" type= "BINDATA" />
201 </if> 201 </if>
202 <if expr="not pp_ifdef('use_ash')"> 202 <if expr="not pp_ifdef('use_ash')">
203 <include name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" type= "BINDATA" /> 203 <include name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" type= "BINDATA" />
204 <include name="IDR_TAB_ACTIVE_LEFT" file="tab_active_left.png" type="BIN DATA" /> 204 <include name="IDR_TAB_ACTIVE_LEFT" file="tab_active_left.png" type="BIN DATA" />
205 <include name="IDR_TAB_ACTIVE_RIGHT" file="tab_active_right.png" type="B INDATA" /> 205 <include name="IDR_TAB_ACTIVE_RIGHT" file="tab_active_right.png" type="B INDATA" />
206 <include name="IDR_TAB_ALPHA_LEFT" file="tab_alpha_left.png" type="BINDA TA" /> 206 <include name="IDR_TAB_ALPHA_LEFT" file="tab_alpha_left.png" type="BINDA TA" />
207 <include name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right.png" type="BIN DATA" /> 207 <include name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right.png" type="BIN DATA" />
208 </if> 208 </if>
209 <include name="IDR_TAB_CLOSE" file="tab_close.png" type="BINDATA" /> 209 <!-- Note: Tab close buttons are not traditional buttons. Tab close butto ns
210 <include name="IDR_TAB_CLOSE_H" file="tab_close_h.png" type="BINDATA" /> 210 fill a background with a color from the theme, tile IDR_TAB_CLOSE ove r it,
211 <include name="IDR_TAB_CLOSE_MASK" file="tab_close_mask.png" type="BINDATA " /> 211 then apply IDR_TAB_CLOSE_MASK. See chrome/browser/ui/views/tabs/tab. cc -->
212 <include name="IDR_TAB_CLOSE_P" file="tab_close_p.png" type="BINDATA" /> 212 <if expr="pp_ifdef('use_ash')">
213 <include name="IDR_TAB_CLOSE" file="ash/tab_close_normal.png" type="BIND ATA" />
214 <include name="IDR_TAB_CLOSE_H" file="ash/tab_close_hot.png" type="BINDA TA" />
215 <include name="IDR_TAB_CLOSE_MASK" file="ash/tab_close_mask.png" type="B INDATA" />
216 <include name="IDR_TAB_CLOSE_P" file="ash/tab_close_pressed.png" type="B INDATA" />
217 </if>
218 <if expr="not pp_ifdef('use_ash')">
219 <include name="IDR_TAB_CLOSE" file="tab_close.png" type="BINDATA" />
220 <include name="IDR_TAB_CLOSE_H" file="tab_close_h.png" type="BINDATA" />
221 <include name="IDR_TAB_CLOSE_MASK" file="tab_close_mask.png" type="BINDA TA" />
222 <include name="IDR_TAB_CLOSE_P" file="tab_close_p.png" type="BINDATA" />
223 </if>
213 <include name="IDR_TAB_DROP_DOWN" file="tab_drop_down.png" type="BINDATA" /> 224 <include name="IDR_TAB_DROP_DOWN" file="tab_drop_down.png" type="BINDATA" />
214 <include name="IDR_TAB_DROP_UP" file="tab_drop_up.png" type="BINDATA" /> 225 <include name="IDR_TAB_DROP_UP" file="tab_drop_up.png" type="BINDATA" />
215 <if expr="pp_ifdef('use_ash')"> 226 <if expr="pp_ifdef('use_ash')">
216 <include name="IDR_TAB_INACTIVE_CENTER" file="ash/tab_inactive_center.pn g" type="BINDATA" /> 227 <include name="IDR_TAB_INACTIVE_CENTER" file="ash/tab_inactive_center.pn g" type="BINDATA" />
217 <include name="IDR_TAB_INACTIVE_LEFT" file="ash/tab_inactive_left.png" t ype="BINDATA" /> 228 <include name="IDR_TAB_INACTIVE_LEFT" file="ash/tab_inactive_left.png" t ype="BINDATA" />
218 <include name="IDR_TAB_INACTIVE_RIGHT" file="ash/tab_inactive_right.png" type="BINDATA" /> 229 <include name="IDR_TAB_INACTIVE_RIGHT" file="ash/tab_inactive_right.png" type="BINDATA" />
219 </if> 230 </if>
220 <if expr="not pp_ifdef('use_ash')"> 231 <if expr="not pp_ifdef('use_ash')">
221 <include name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center.png" t ype="BINDATA" /> 232 <include name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center.png" t ype="BINDATA" />
222 <include name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left.png" type= "BINDATA" /> 233 <include name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left.png" type= "BINDATA" />
223 <include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right.png" typ e="BINDATA" /> 234 <include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right.png" typ e="BINDATA" />
224 </if> 235 </if>
225 <if expr="pp_ifdef('use_ash')"> 236 <if expr="pp_ifdef('use_ash')">
226 <include name="IDR_THEME_FRAME" file="ash/theme_frame.png" type="BINDATA " /> 237 <include name="IDR_THEME_FRAME" file="ash/theme_default_active.png" type ="BINDATA" />
227 <include name="IDR_THEME_FRAME_INACTIVE" file="ash/theme_frame_inactive. png" type="BINDATA" /> 238 <include name="IDR_THEME_FRAME_INACTIVE" file="ash/theme_default_inactiv e.png" type="BINDATA" />
228 <include name="IDR_THEME_FRAME_INCOGNITO" file="ash/theme_frame_incognit o.png" type="BINDATA" /> 239 <include name="IDR_THEME_FRAME_INCOGNITO" file="ash/theme_incognito_acti ve.png" type="BINDATA" />
229 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="ash/theme_frame _incognito_inactive.png" type="BINDATA" /> 240 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="ash/theme_incog nito_inactive.png" type="BINDATA" />
230 </if> 241 </if>
231 <if expr="not pp_ifdef('use_ash')"> 242 <if expr="not pp_ifdef('use_ash')">
232 <include name="IDR_THEME_FRAME" file="theme_frame.png" type="BINDATA" /> 243 <include name="IDR_THEME_FRAME" file="theme_frame.png" type="BINDATA" />
233 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_inactive.png" type="BINDATA" /> 244 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_inactive.png" type="BINDATA" />
234 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_incognito.pn g" type="BINDATA" /> 245 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_incognito.pn g" type="BINDATA" />
235 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_inc ognito_inactive.png" type="BINDATA" /> 246 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_inc ognito_inactive.png" type="BINDATA" />
236 </if> 247 </if>
237 <if expr="pp_ifdef('use_ash')"> 248 <if expr="pp_ifdef('use_ash')">
238 <include name="IDR_THEME_TAB_BACKGROUND" file="ash/theme_tab_background. png" type="BINDATA" /> 249 <include name="IDR_THEME_TAB_BACKGROUND" file="ash/theme_tab_background. png" type="BINDATA" />
239 </if> 250 </if>
(...skipping 19 matching lines...) Expand all
259 <include name="IDR_TOOLS_P" file="ash/browser_tools_pressed.png" type="B INDATA" /> 270 <include name="IDR_TOOLS_P" file="ash/browser_tools_pressed.png" type="B INDATA" />
260 </if> 271 </if>
261 <if expr="not pp_ifdef('use_ash')"> 272 <if expr="not pp_ifdef('use_ash')">
262 <include name="IDR_TOOLS" file="tools.png" type="BINDATA" /> 273 <include name="IDR_TOOLS" file="tools.png" type="BINDATA" />
263 <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" /> 274 <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" />
264 <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" /> 275 <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" />
265 </if> 276 </if>
266 </includes> 277 </includes>
267 </release> 278 </release>
268 </grit> 279 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources_metro_1x.grd ('k') | ui/resources/aura/textbutton_hot_bottom.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698