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

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

Issue 10662032: alternate ntp (cros/partial-win): add tab-related stuff and toolbar/tab background change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed scott's comments Created 8 years, 5 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
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" context= "default_100_percent"> 4 <output filename="grit/theme_resources_standard.h" type="rc_header" context= "default_100_percent">
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" context="default_100_percent" /> 7 <output filename="grit/theme_resources_standard_map.cc" type="resource_map_s ource" context="default_100_percent" />
8 <output filename="grit/theme_resources_standard_map.h" type="resource_map_he ader" context="default_100_percent" /> 8 <output filename="grit/theme_resources_standard_map.h" type="resource_map_he ader" context="default_100_percent" />
9 <output filename="theme_resources_standard.pak" type="data_package" context= "default_100_percent" /> 9 <output filename="theme_resources_standard.pak" type="data_package" context= "default_100_percent" />
10 <output filename="theme_resources_2x.pak" type="data_package" context="defau lt_200_percent" /> 10 <output filename="theme_resources_2x.pak" type="data_package" context="defau lt_200_percent" />
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 <if expr="pp_ifdef('use_ash')"> 442 <if expr="pp_ifdef('use_ash')">
443 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="ash /theme_toolbar_default.png" /> 443 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="ash /theme_toolbar_default.png" />
444 </if> 444 </if>
445 <if expr="not pp_ifdef('use_ash') and is_macosx"> 445 <if expr="not pp_ifdef('use_ash') and is_macosx">
446 <!-- TODO(jamescook): Is this right? --> 446 <!-- TODO(jamescook): Is this right? -->
447 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="the me_toolbar_default2.png" /> 447 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="the me_toolbar_default2.png" />
448 </if> 448 </if>
449 <if expr="not pp_ifdef('use_ash') and not is_macosx"> 449 <if expr="not pp_ifdef('use_ash') and not is_macosx">
450 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="the me_toolbar_default.png" /> 450 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="the me_toolbar_default.png" />
451 </if> 451 </if>
452 <!-- Instant Extended API toolbar background is common for all platforms. -->
453 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_SEARCH" file ="theme_toolbar_search.png" />
452 <if expr="is_macosx"> 454 <if expr="is_macosx">
453 <!-- TODO(jamescook): Is this right? --> 455 <!-- TODO(jamescook): Is this right? -->
454 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_INACTIVE" file="theme_toolbar_default_inactive2.png" /> 456 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_INACTIVE" file="theme_toolbar_default_inactive2.png" />
455 </if> 457 </if>
456 <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING" file="th robber_waiting.png" /> 458 <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING" file="th robber_waiting.png" />
457 <if expr="pp_ifdef('toolkit_views')"> 459 <if expr="pp_ifdef('toolkit_views')">
458 <structure type="chrome_scaled_image" name="IDR_TOOLS" file="ash/browser _tools_normal.png" /> 460 <structure type="chrome_scaled_image" name="IDR_TOOLS" file="ash/browser _tools_normal.png" />
459 <structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="ash/brows er_tools_hover.png" /> 461 <structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="ash/brows er_tools_hover.png" />
460 <structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="ash/brows er_tools_pressed.png" /> 462 <structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="ash/brows er_tools_pressed.png" />
461 </if> 463 </if>
(...skipping 11 matching lines...) Expand all
473 <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU" file="update_ menu.png" /> 475 <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU" file="update_ menu.png" />
474 <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU2" file="update _menu2.png" /> 476 <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU2" file="update _menu2.png" />
475 <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU3" file="update _menu3.png" /> 477 <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU3" file="update _menu3.png" />
476 <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU4" file="update _menu4.png" /> 478 <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU4" file="update _menu4.png" />
477 <structure type="chrome_scaled_image" name="IDR_WARNING" file="alert_small .png" /> 479 <structure type="chrome_scaled_image" name="IDR_WARNING" file="alert_small .png" />
478 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" /> 480 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" />
479 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" /> 481 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" />
480 </structures> 482 </structures>
481 </release> 483 </release>
482 </grit> 484 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/default_100_percent/ntp_background.png ('k') | chrome/browser/themes/theme_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698