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

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

Issue 10854173: Use a placeholder logo image/label in SearchViewController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments; restore browser_context_ member. Created 8 years, 4 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.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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 <structure type="chrome_scaled_image" name="IDR_FORWARD" file="common/br owser_forward_normal.png" /> 248 <structure type="chrome_scaled_image" name="IDR_FORWARD" file="common/br owser_forward_normal.png" />
249 <structure type="chrome_scaled_image" name="IDR_FORWARD_D" file="common/ browser_forward_disabled.png" /> 249 <structure type="chrome_scaled_image" name="IDR_FORWARD_D" file="common/ browser_forward_disabled.png" />
250 <structure type="chrome_scaled_image" name="IDR_FORWARD_H" file="common/ browser_forward_hover.png" /> 250 <structure type="chrome_scaled_image" name="IDR_FORWARD_H" file="common/ browser_forward_hover.png" />
251 <structure type="chrome_scaled_image" name="IDR_FORWARD_P" file="common/ browser_forward_pressed.png" /> 251 <structure type="chrome_scaled_image" name="IDR_FORWARD_P" file="common/ browser_forward_pressed.png" />
252 </if> 252 </if>
253 <structure type="chrome_scaled_image" name="IDR_FROZEN_TAB_ICON" file="fro zen_tab.png" /> 253 <structure type="chrome_scaled_image" name="IDR_FROZEN_TAB_ICON" file="fro zen_tab.png" />
254 <structure type="chrome_scaled_image" name="IDR_FULLSCREEN_MENU_BUTTON" fi le="fullscreen_menu_button.png" /> 254 <structure type="chrome_scaled_image" name="IDR_FULLSCREEN_MENU_BUTTON" fi le="fullscreen_menu_button.png" />
255 <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_ALLOWED_LOCATI ONBAR_ICON" file="geolocation_allowed_locationbar_icon.png" /> 255 <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_ALLOWED_LOCATI ONBAR_ICON" file="geolocation_allowed_locationbar_icon.png" />
256 <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_DENIED_LOCATIO NBAR_ICON" file="geolocation_denied_locationbar_icon.png" /> 256 <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_DENIED_LOCATIO NBAR_ICON" file="geolocation_denied_locationbar_icon.png" />
257 <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_INFOBAR_ICON" file="infobar_geolocation.png" /> 257 <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_INFOBAR_ICON" file="infobar_geolocation.png" />
258 <if expr="pp_ifdef('_google_chrome')">
259 <structure type="chrome_scaled_image" name="IDR_GOOGLE_LOGO_LG" file="g oogle_chrome/google_logo_lg.png" />
260 </if>
258 <if expr="pp_ifdef('chromeos')"> 261 <if expr="pp_ifdef('chromeos')">
259 <structure type="chrome_scaled_image" name="IDR_GUEST_ICON" file="guest_ icon.png" /> 262 <structure type="chrome_scaled_image" name="IDR_GUEST_ICON" file="guest_ icon.png" />
260 <structure type="chrome_scaled_image" name="IDR_HELP_MENU" file="help_16 .png" /> 263 <structure type="chrome_scaled_image" name="IDR_HELP_MENU" file="help_16 .png" />
261 </if> 264 </if>
262 <structure type="chrome_scaled_image" name="IDR_HISTORY_FAVICON" file="his tory_favicon.png" /> 265 <structure type="chrome_scaled_image" name="IDR_HISTORY_FAVICON" file="his tory_favicon.png" />
263 <if expr="not pp_ifdef('toolkit_views')"> 266 <if expr="not pp_ifdef('toolkit_views')">
264 <structure type="chrome_scaled_image" name="IDR_HOME" file="home.png" /> 267 <structure type="chrome_scaled_image" name="IDR_HOME" file="home.png" />
265 </if> 268 </if>
266 <if expr="pp_ifdef('toolkit_views')"> 269 <if expr="pp_ifdef('toolkit_views')">
267 <structure type="chrome_scaled_image" name="IDR_HOME" file="common/brows er_home_normal.png" /> 270 <structure type="chrome_scaled_image" name="IDR_HOME" file="common/brows er_home_normal.png" />
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 <if expr="not is_macosx"> 897 <if expr="not is_macosx">
895 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.pn g" type="BINDATA" /> 898 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.pn g" type="BINDATA" />
896 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_lo go_22.png" type="BINDATA" /> 899 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_lo go_22.png" type="BINDATA" />
897 </if> 900 </if>
898 <include name="IDR_WIZARD_ICON" file="chromium/wizard_icon.png" type="BI NDATA" /> 901 <include name="IDR_WIZARD_ICON" file="chromium/wizard_icon.png" type="BI NDATA" />
899 <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" /> 902 <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" />
900 </if> 903 </if>
901 </includes> 904 </includes>
902 </release> 905 </release>
903 </grit> 906 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view.cc » ('j') | chrome/browser/ui/views/search_view_controller.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698