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

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

Issue 10910286: alternate ntp: show search provider logo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased, merged conflicts Created 8 years, 3 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/browser/resources/instant/instant.js » ('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.h" type="rc_header" context="default_ 100_percent"> 4 <output filename="grit/theme_resources.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_map.cc" type="resource_map_source" co ntext="default_100_percent" /> 7 <output filename="grit/theme_resources_map.cc" type="resource_map_source" co ntext="default_100_percent" />
8 <output filename="grit/theme_resources_map.h" type="resource_map_header" con text="default_100_percent" /> 8 <output filename="grit/theme_resources_map.h" type="resource_map_header" con text="default_100_percent" />
9 <output filename="theme_resources_100_percent.pak" type="data_package" conte xt="default_100_percent" /> 9 <output filename="theme_resources_100_percent.pak" type="data_package" conte xt="default_100_percent" />
10 <output filename="theme_resources_200_percent.pak" type="data_package" conte xt="default_200_percent" /> 10 <output filename="theme_resources_200_percent.pak" type="data_package" conte xt="default_200_percent" />
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 <structure type="chrome_scaled_image" name="IDR_FORWARD" file="common/br owser_forward_normal.png" /> 315 <structure type="chrome_scaled_image" name="IDR_FORWARD" file="common/br owser_forward_normal.png" />
316 <structure type="chrome_scaled_image" name="IDR_FORWARD_D" file="common/ browser_forward_disabled.png" /> 316 <structure type="chrome_scaled_image" name="IDR_FORWARD_D" file="common/ browser_forward_disabled.png" />
317 <structure type="chrome_scaled_image" name="IDR_FORWARD_H" file="common/ browser_forward_hover.png" /> 317 <structure type="chrome_scaled_image" name="IDR_FORWARD_H" file="common/ browser_forward_hover.png" />
318 <structure type="chrome_scaled_image" name="IDR_FORWARD_P" file="common/ browser_forward_pressed.png" /> 318 <structure type="chrome_scaled_image" name="IDR_FORWARD_P" file="common/ browser_forward_pressed.png" />
319 </if> 319 </if>
320 <structure type="chrome_scaled_image" name="IDR_FROZEN_TAB_ICON" file="fro zen_tab.png" /> 320 <structure type="chrome_scaled_image" name="IDR_FROZEN_TAB_ICON" file="fro zen_tab.png" />
321 <structure type="chrome_scaled_image" name="IDR_FULLSCREEN_MENU_BUTTON" fi le="fullscreen_menu_button.png" /> 321 <structure type="chrome_scaled_image" name="IDR_FULLSCREEN_MENU_BUTTON" fi le="fullscreen_menu_button.png" />
322 <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_ALLOWED_LOCATI ONBAR_ICON" file="allowed_location.png" /> 322 <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_ALLOWED_LOCATI ONBAR_ICON" file="allowed_location.png" />
323 <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_DENIED_LOCATIO NBAR_ICON" file="blocked_location.png" /> 323 <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_DENIED_LOCATIO NBAR_ICON" file="blocked_location.png" />
324 <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_INFOBAR_ICON" file="infobar_geolocation.png" /> 324 <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_INFOBAR_ICON" file="infobar_geolocation.png" />
325 <if expr="pp_ifdef('_google_chrome')"> 325 <structure type="chrome_scaled_image" name="IDR_GOOGLE_LOGO_LG" file="goog le_logo_lg.png" />
326 <structure type="chrome_scaled_image" name="IDR_GOOGLE_LOGO_LG" file="g oogle_chrome/google_logo_lg.png" />
327 </if>
328 <if expr="pp_ifdef('chromeos')"> 326 <if expr="pp_ifdef('chromeos')">
329 <structure type="chrome_scaled_image" name="IDR_HELP_MENU" file="help_16 .png" /> 327 <structure type="chrome_scaled_image" name="IDR_HELP_MENU" file="help_16 .png" />
330 </if> 328 </if>
331 <structure type="chrome_scaled_image" name="IDR_HISTORY_FAVICON" file="com mon/favicon_history.png" /> 329 <structure type="chrome_scaled_image" name="IDR_HISTORY_FAVICON" file="com mon/favicon_history.png" />
332 <if expr="not pp_ifdef('toolkit_views')"> 330 <if expr="not pp_ifdef('toolkit_views')">
333 <structure type="chrome_scaled_image" name="IDR_HOME" file="home.png" /> 331 <structure type="chrome_scaled_image" name="IDR_HOME" file="home.png" />
334 </if> 332 </if>
335 <if expr="pp_ifdef('toolkit_views')"> 333 <if expr="pp_ifdef('toolkit_views')">
336 <structure type="chrome_scaled_image" name="IDR_HOME" file="common/brows er_home_normal.png" /> 334 <structure type="chrome_scaled_image" name="IDR_HOME" file="common/brows er_home_normal.png" />
337 </if> 335 </if>
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 <if expr="not is_macosx"> 968 <if expr="not is_macosx">
971 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.pn g" type="BINDATA" /> 969 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.pn g" type="BINDATA" />
972 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_lo go_22.png" type="BINDATA" /> 970 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_lo go_22.png" type="BINDATA" />
973 </if> 971 </if>
974 <include name="IDR_WIZARD_ICON" file="chromium/wizard_icon.png" type="BI NDATA" /> 972 <include name="IDR_WIZARD_ICON" file="chromium/wizard_icon.png" type="BI NDATA" />
975 <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" /> 973 <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" />
976 </if> 974 </if>
977 </includes> 975 </includes>
978 </release> 976 </release>
979 </grit> 977 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/instant/instant.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698