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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 159475: Merge 21608 - , INNTP: Adds 2 hard coded thumbnails.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 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
« no previous file with comments | « chrome/app/resources/locale_settings.grd ('k') | chrome/browser/dom_ui/new_tab_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/chrome/app/theme/theme_resources.grd:r21608
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"> 4 <output filename="grit/theme_resources.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.rc" type="rc_all" /> 7 <output filename="theme_resources.rc" type="rc_all" />
8 <output filename="theme_resources.pak" type="data_package" /> 8 <output filename="theme_resources.pak" type="data_package" />
9 <output filename="grit/theme_resources_map.h" type="resource_map_header" /> 9 <output filename="grit/theme_resources_map.h" type="resource_map_header" />
10 <output filename="grit/theme_resources_map.cc" type="resource_map_source" /> 10 <output filename="grit/theme_resources_map.cc" type="resource_map_source" />
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 <include name="IDR_NEWTAB_MENU_MASK" file="ntp_menu_mask.png" type="BINDAT A" /> 177 <include name="IDR_NEWTAB_MENU_MASK" file="ntp_menu_mask.png" type="BINDAT A" />
178 <include name="IDR_NEWTAB_THUMB_OFF" file="ntp_thumb_off.png" type="BINDAT A" /> 178 <include name="IDR_NEWTAB_THUMB_OFF" file="ntp_thumb_off.png" type="BINDAT A" />
179 <include name="IDR_NEWTAB_THUMB_OFF_H" file="ntp_thumb_off_h.png" type="BI NDATA" /> 179 <include name="IDR_NEWTAB_THUMB_OFF_H" file="ntp_thumb_off_h.png" type="BI NDATA" />
180 <include name="IDR_NEWTAB_THUMB_OFF_P" file="ntp_thumb_off_p.png" type="BI NDATA" /> 180 <include name="IDR_NEWTAB_THUMB_OFF_P" file="ntp_thumb_off_p.png" type="BI NDATA" />
181 <include name="IDR_NEWTAB_THUMB_ON" file="ntp_thumb_on.png" type="BINDATA" /> 181 <include name="IDR_NEWTAB_THUMB_ON" file="ntp_thumb_on.png" type="BINDATA" />
182 <include name="IDR_NEWTAB_THUMB_ON_H" file="ntp_thumb_on_h.png" type="BIND ATA" /> 182 <include name="IDR_NEWTAB_THUMB_ON_H" file="ntp_thumb_on_h.png" type="BIND ATA" />
183 <include name="IDR_NEWTAB_THUMB_ON_P" file="ntp_thumb_on_p.png" type="BIND ATA" /> 183 <include name="IDR_NEWTAB_THUMB_ON_P" file="ntp_thumb_on_p.png" type="BIND ATA" />
184 <include name="IDR_NEWTAB_OPTION" file="ntp_option.png" type="BINDATA" /> 184 <include name="IDR_NEWTAB_OPTION" file="ntp_option.png" type="BINDATA" />
185 <include name="IDR_NEWTAB_OPTION_H" file="ntp_option_h.png" type="BINDATA" /> 185 <include name="IDR_NEWTAB_OPTION_H" file="ntp_option_h.png" type="BINDATA" />
186 <include name="IDR_NEWTAB_OPTION_P" file="ntp_option_p.png" type="BINDATA" /> 186 <include name="IDR_NEWTAB_OPTION_P" file="ntp_option_p.png" type="BINDATA" />
187 <include name="IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL" file="ntp_welcome _thumb.png" type="BINDATA" />
188 <include name="IDR_NEWTAB_CHROME_WELCOME_PAGE_FAVICON" file="ntp_welcome_f avicon.png" type="BINDATA" />
189 <include name="IDR_NEWTAB_THEMES_GALLERY_THUMBNAIL" file="ntp_themes_galle ry_thumb.png" type="BINDATA" />
190 <include name="IDR_NEWTAB_THEMES_GALLERY_FAVICON" file="ntp_themes_gallery _favicon.png" type="BINDATA" />
187 <include name="IDR_ARROW_RIGHT" file="arrow_right.png" type="BINDATA" /> 191 <include name="IDR_ARROW_RIGHT" file="arrow_right.png" type="BINDATA" />
188 <include name="IDR_SAD_TAB" file="sadtab.png" type="BINDATA" /> 192 <include name="IDR_SAD_TAB" file="sadtab.png" type="BINDATA" />
189 <include name="IDR_OTR_ICON" file="otr_icon.png" type="BINDATA" /> 193 <include name="IDR_OTR_ICON" file="otr_icon.png" type="BINDATA" />
190 <include name="IDR_CONSTRAINED_BOTTOM_CENTER_V" file="constrained_bottom_c enter_v.png" type="BINDATA" /> 194 <include name="IDR_CONSTRAINED_BOTTOM_CENTER_V" file="constrained_bottom_c enter_v.png" type="BINDATA" />
191 <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V" file="constrained_bot tom_left_corner_v.png" type="BINDATA" /> 195 <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V" file="constrained_bot tom_left_corner_v.png" type="BINDATA" />
192 <include name="IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V" file="constrained_bo ttom_right_corner_v.png" type="BINDATA" /> 196 <include name="IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V" file="constrained_bo ttom_right_corner_v.png" type="BINDATA" />
193 <include name="IDR_CONSTRAINED_LEFT_SIDE_V" file="constrained_left_side_v. png" type="BINDATA" /> 197 <include name="IDR_CONSTRAINED_LEFT_SIDE_V" file="constrained_left_side_v. png" type="BINDATA" />
194 <include name="IDR_CONSTRAINED_RIGHT_SIDE_V" file="constrained_right_side_ v.png" type="BINDATA" /> 198 <include name="IDR_CONSTRAINED_RIGHT_SIDE_V" file="constrained_right_side_ v.png" type="BINDATA" />
195 <include name="IDR_CONSTRAINED_TOP_CENTER_V" file="constrained_top_center_ v.png" type="BINDATA" /> 199 <include name="IDR_CONSTRAINED_TOP_CENTER_V" file="constrained_top_center_ v.png" type="BINDATA" />
196 <include name="IDR_CONSTRAINED_TOP_LEFT_CORNER_V" file="constrained_top_le ft_corner_v.png" type="BINDATA" /> 200 <include name="IDR_CONSTRAINED_TOP_LEFT_CORNER_V" file="constrained_top_le ft_corner_v.png" type="BINDATA" />
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 <include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" /> 333 <include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" />
330 </if> 334 </if>
331 335
332 <if expr="pp_ifdef('chromeos')"> 336 <if expr="pp_ifdef('chromeos')">
333 <include name="IDR_NEW_BROWSER_WINDOW_ICON" file="new_browser_window.png " type="BINDATA" /> 337 <include name="IDR_NEW_BROWSER_WINDOW_ICON" file="new_browser_window.png " type="BINDATA" />
334 <include name="IDR_TAB_OVERVIEW_BUTTON_ICON" file="tab_overview.png" typ e="BINDATA" /> 338 <include name="IDR_TAB_OVERVIEW_BUTTON_ICON" file="tab_overview.png" typ e="BINDATA" />
335 </if> 339 </if>
336 </includes> 340 </includes>
337 </release> 341 </release>
338 </grit> 342 </grit>
OLDNEW
« no previous file with comments | « chrome/app/resources/locale_settings.grd ('k') | chrome/browser/dom_ui/new_tab_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698