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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 5124004: Use the new icons from Cole for about:conflicts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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/theme/conflicts_section.png ('k') | chrome/browser/dom_ui/conflicts_ui.cc » ('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"> 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="grit/theme_resources_map.cc" type="resource_map_source" /> 7 <output filename="grit/theme_resources_map.cc" type="resource_map_source" />
8 <output filename="grit/theme_resources_map.h" type="resource_map_header" /> 8 <output filename="grit/theme_resources_map.h" type="resource_map_header" />
9 <output filename="theme_resources.pak" type="data_package" /> 9 <output filename="theme_resources.pak" type="data_package" />
10 <output filename="theme_resources.rc" type="rc_all" /> 10 <output filename="theme_resources.rc" type="rc_all" />
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 <include name="IDR_BUBBLE_TR" file="bubble_tr.png" type="BINDATA" /> 74 <include name="IDR_BUBBLE_TR" file="bubble_tr.png" type="BINDATA" />
75 <include name="IDR_BUBBLE_T_ARROW" file="bubble_pointer_t.png" type="BINDA TA" /> 75 <include name="IDR_BUBBLE_T_ARROW" file="bubble_pointer_t.png" type="BINDA TA" />
76 <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" /> 76 <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
77 <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" /> 77 <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
78 <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA " /> 78 <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA " />
79 <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" /> 79 <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" />
80 <include name="IDR_CLOSE_BUTTON_MASK" file="close_button_mask.png" type="B INDATA" /> 80 <include name="IDR_CLOSE_BUTTON_MASK" file="close_button_mask.png" type="B INDATA" />
81 <if expr="os.find('win') != -1"> 81 <if expr="os.find('win') != -1">
82 <include name="IDR_CONFLICT_BADGE" file="conflict_badge.png" type="BINDA TA" /> 82 <include name="IDR_CONFLICT_BADGE" file="conflict_badge.png" type="BINDA TA" />
83 <include name="IDR_CONFLICT_MENU" file="conflict_menu.png" type="BINDATA " /> 83 <include name="IDR_CONFLICT_MENU" file="conflict_menu.png" type="BINDATA " />
84 <include name="IDR_CONFLICT_FAVICON" file="about_conflicts_favicon.png" type="BINDATA" />
84 </if> 85 </if>
85 <include name="IDR_CONSTRAINED_BOTTOM_CENTER_V" file="constrained_bottom_c enter_v.png" type="BINDATA" /> 86 <include name="IDR_CONSTRAINED_BOTTOM_CENTER_V" file="constrained_bottom_c enter_v.png" type="BINDATA" />
86 <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V" file="constrained_bot tom_left_corner_v.png" type="BINDATA" /> 87 <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V" file="constrained_bot tom_left_corner_v.png" type="BINDATA" />
87 <include name="IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V" file="constrained_bo ttom_right_corner_v.png" type="BINDATA" /> 88 <include name="IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V" file="constrained_bo ttom_right_corner_v.png" type="BINDATA" />
88 <include name="IDR_CONSTRAINED_LEFT_SIDE_V" file="constrained_left_side_v. png" type="BINDATA" /> 89 <include name="IDR_CONSTRAINED_LEFT_SIDE_V" file="constrained_left_side_v. png" type="BINDATA" />
89 <include name="IDR_CONSTRAINED_RIGHT_SIDE_V" file="constrained_right_side_ v.png" type="BINDATA" /> 90 <include name="IDR_CONSTRAINED_RIGHT_SIDE_V" file="constrained_right_side_ v.png" type="BINDATA" />
90 <include name="IDR_CONSTRAINED_TOP_CENTER_V" file="constrained_top_center_ v.png" type="BINDATA" /> 91 <include name="IDR_CONSTRAINED_TOP_CENTER_V" file="constrained_top_center_ v.png" type="BINDATA" />
91 <include name="IDR_CONSTRAINED_TOP_LEFT_CORNER_V" file="constrained_top_le ft_corner_v.png" type="BINDATA" /> 92 <include name="IDR_CONSTRAINED_TOP_LEFT_CORNER_V" file="constrained_top_le ft_corner_v.png" type="BINDATA" />
92 <include name="IDR_CONSTRAINED_TOP_RIGHT_CORNER_V" file="constrained_top_r ight_corner_v.png" type="BINDATA" /> 93 <include name="IDR_CONSTRAINED_TOP_RIGHT_CORNER_V" file="constrained_top_r ight_corner_v.png" type="BINDATA" />
93 <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type= "BINDATA" /> 94 <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type= "BINDATA" />
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 <include name="IDR_DROPDOWN_TOP_H" file="textbutton_dropdown_t_h.png" ty pe="BINDATA" /> 608 <include name="IDR_DROPDOWN_TOP_H" file="textbutton_dropdown_t_h.png" ty pe="BINDATA" />
608 <include name="IDR_DROPDOWN_TOP_LEFT_H" file="textbutton_dropdown_tl_h.p ng" type="BINDATA" /> 609 <include name="IDR_DROPDOWN_TOP_LEFT_H" file="textbutton_dropdown_tl_h.p ng" type="BINDATA" />
609 <include name="IDR_DROPDOWN_TOP_LEFT_P" file="textbutton_dropdown_tl_p.p ng" type="BINDATA" /> 610 <include name="IDR_DROPDOWN_TOP_LEFT_P" file="textbutton_dropdown_tl_p.p ng" type="BINDATA" />
610 <include name="IDR_DROPDOWN_TOP_P" file="textbutton_dropdown_t_p.png" ty pe="BINDATA" /> 611 <include name="IDR_DROPDOWN_TOP_P" file="textbutton_dropdown_t_p.png" ty pe="BINDATA" />
611 <include name="IDR_DROPDOWN_TOP_RIGHT_H" file="textbutton_dropdown_tr_h. png" type="BINDATA" /> 612 <include name="IDR_DROPDOWN_TOP_RIGHT_H" file="textbutton_dropdown_tr_h. png" type="BINDATA" />
612 <include name="IDR_DROPDOWN_TOP_RIGHT_P" file="textbutton_dropdown_tr_p. png" type="BINDATA" /> 613 <include name="IDR_DROPDOWN_TOP_RIGHT_P" file="textbutton_dropdown_tr_p. png" type="BINDATA" />
613 </if> 614 </if>
614 </includes> 615 </includes>
615 </release> 616 </release>
616 </grit> 617 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/conflicts_section.png ('k') | chrome/browser/dom_ui/conflicts_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698