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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 165372: Merge 22980 - Mask the close button on the download shelf so that it's visibl... (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 | « no previous file | chrome/browser/views/download_shelf_view.h » ('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:r22980
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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 <include name="IDR_HISTORY_SECTION" file="history_section.png" type="BINDA TA" /> 229 <include name="IDR_HISTORY_SECTION" file="history_section.png" type="BINDA TA" />
230 <include name="IDR_DOWNLOADS_SECTION" file="downloads_section.png" type="B INDATA" /> 230 <include name="IDR_DOWNLOADS_SECTION" file="downloads_section.png" type="B INDATA" />
231 <include name="IDR_DEFAULT_THUMBNAIL" file="default_thumbnail.png" type="B INDATA" /> 231 <include name="IDR_DEFAULT_THUMBNAIL" file="default_thumbnail.png" type="B INDATA" />
232 <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BIN DATA" /> 232 <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BIN DATA" />
233 <include name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.pn g" type="BINDATA" /> 233 <include name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.pn g" type="BINDATA" />
234 <include name="IDR_UPDATE_UPTODATE" file="update_uptodate.png" type="BINDA TA" /> 234 <include name="IDR_UPDATE_UPTODATE" file="update_uptodate.png" type="BINDA TA" />
235 <include name="IDR_UPDATE_FAIL" file="update_fail.png" type="BINDATA" /> 235 <include name="IDR_UPDATE_FAIL" file="update_fail.png" type="BINDATA" />
236 <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" /> 236 <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
237 <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" /> 237 <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
238 <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" /> 238 <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" />
239 <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA " />
239 <include name="IDR_HOME" file="home.png" type="BINDATA" /> 240 <include name="IDR_HOME" file="home.png" type="BINDATA" />
240 <include name="IDR_HOME_H" file="home_h.png" type="BINDATA" /> 241 <include name="IDR_HOME_H" file="home_h.png" type="BINDATA" />
241 <include name="IDR_HOME_P" file="home_p.png" type="BINDATA" /> 242 <include name="IDR_HOME_P" file="home_p.png" type="BINDATA" />
242 <include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDA TA" /> 243 <include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDA TA" />
243 <include name="IDR_DOWNLOADS_FAVICON" file="downloads_favicon.png" type="B INDATA" /> 244 <include name="IDR_DOWNLOADS_FAVICON" file="downloads_favicon.png" type="B INDATA" />
244 <include name="IDR_MENU_PAGE_RTL" file="menu_page_rtl.png" type="BINDATA" /> 245 <include name="IDR_MENU_PAGE_RTL" file="menu_page_rtl.png" type="BINDATA" />
245 <include name="IDR_MENU_CHROME_RTL" file="menu_chrome_rtl.png" type="BINDA TA" /> 246 <include name="IDR_MENU_CHROME_RTL" file="menu_chrome_rtl.png" type="BINDA TA" />
246 <include name="IDR_DOWNLOAD_ANIMATION_BEGIN" file="download_animation_begi n.png" type="BINDATA" /> 247 <include name="IDR_DOWNLOAD_ANIMATION_BEGIN" file="download_animation_begi n.png" type="BINDATA" />
247 <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder.png" typ e="BINDATA" /> 248 <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder.png" typ e="BINDATA" />
248 <include name="IDR_THROBBER_LIGHT" file="throbber_light.png" type="BINDATA " /> 249 <include name="IDR_THROBBER_LIGHT" file="throbber_light.png" type="BINDATA " />
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 <include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" /> 334 <include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" />
334 </if> 335 </if>
335 336
336 <if expr="pp_ifdef('chromeos')"> 337 <if expr="pp_ifdef('chromeos')">
337 <include name="IDR_NEW_BROWSER_WINDOW_ICON" file="new_browser_window.png " type="BINDATA" /> 338 <include name="IDR_NEW_BROWSER_WINDOW_ICON" file="new_browser_window.png " type="BINDATA" />
338 <include name="IDR_TAB_OVERVIEW_BUTTON_ICON" file="tab_overview.png" typ e="BINDATA" /> 339 <include name="IDR_TAB_OVERVIEW_BUTTON_ICON" file="tab_overview.png" typ e="BINDATA" />
339 </if> 340 </if>
340 </includes> 341 </includes>
341 </release> 342 </release>
342 </grit> 343 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/views/download_shelf_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698