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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7663001: Make bubble_border use resources under ui/resources. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge Created 9 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/theme/theme_resources_large.grd ('k') | chrome/browser/ui/views/bubble/bubble_border.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_standard.h" type="rc_header"> 4 <output filename="grit/theme_resources_standard.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_standard_map.cc" type="resource_map_s ource" /> 7 <output filename="grit/theme_resources_standard_map.cc" type="resource_map_s ource" />
8 <output filename="grit/theme_resources_standard_map.h" type="resource_map_he ader" /> 8 <output filename="grit/theme_resources_standard_map.h" type="resource_map_he ader" />
9 <output filename="theme_resources_standard.pak" type="data_package" /> 9 <output filename="theme_resources_standard.pak" type="data_package" />
10 <output filename="theme_resources_standard.rc" type="rc_all" /> 10 <output filename="theme_resources_standard.rc" type="rc_all" />
(...skipping 22 matching lines...) Expand all
33 <if expr="not is_win"> 33 <if expr="not is_win">
34 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overf low.png" type="BINDATA" /> 34 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overf low.png" type="BINDATA" />
35 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_ove rflow_h.png" type="BINDATA" /> 35 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_ove rflow_h.png" type="BINDATA" />
36 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_ove rflow_p.png" type="BINDATA" /> 36 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_ove rflow_p.png" type="BINDATA" />
37 </if> 37 </if>
38 <if expr="is_win"> 38 <if expr="is_win">
39 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overf low_win.png" type="BINDATA" /> 39 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overf low_win.png" type="BINDATA" />
40 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_ove rflow_win_h.png" type="BINDATA" /> 40 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_ove rflow_win_h.png" type="BINDATA" />
41 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_ove rflow_win_p.png" type="BINDATA" /> 41 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_ove rflow_win_p.png" type="BINDATA" />
42 </if> 42 </if>
43 <include name="IDR_BUBBLE_B" file="bubble_b.png" type="BINDATA" />
44 <include name="IDR_BUBBLE_BL" file="bubble_bl.png" type="BINDATA" />
45 <include name="IDR_BUBBLE_BR" file="bubble_br.png" type="BINDATA" />
46 <include name="IDR_BUBBLE_B_ARROW" file="bubble_pointer_b.png" type="BINDA TA" />
47 <include name="IDR_BUBBLE_L" file="bubble_l.png" type="BINDATA" />
48 <include name="IDR_BUBBLE_L_ARROW" file="bubble_pointer_l.png" type="BINDA TA" />
49 <include name="IDR_BUBBLE_R" file="bubble_r.png" type="BINDATA" />
50 <include name="IDR_BUBBLE_R_ARROW" file="bubble_pointer_r.png" type="BINDA TA" />
51 <include name="IDR_BUBBLE_T" file="bubble_t.png" type="BINDATA" />
52 <include name="IDR_BUBBLE_TL" file="bubble_tl.png" type="BINDATA" />
53 <include name="IDR_BUBBLE_TR" file="bubble_tr.png" type="BINDATA" />
54 <include name="IDR_BUBBLE_T_ARROW" file="bubble_pointer_t.png" type="BINDA TA" />
55 <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" /> 43 <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
56 <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" /> 44 <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
57 <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA " /> 45 <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA " />
58 <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" /> 46 <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" />
59 <if expr="is_win"> 47 <if expr="is_win">
60 <include name="IDR_CONFLICT_FAVICON" file="about_conflicts_favicon.png" type="BINDATA" /> 48 <include name="IDR_CONFLICT_FAVICON" file="about_conflicts_favicon.png" type="BINDATA" />
61 </if> 49 </if>
62 <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type= "BINDATA" /> 50 <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type= "BINDATA" />
63 <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner. png" type="BINDATA" /> 51 <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner. png" type="BINDATA" />
64 <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_co rner_mask.png" type="BINDATA" /> 52 <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_co rner_mask.png" type="BINDATA" />
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 <if expr="is_macosx"> 128 <if expr="is_macosx">
141 <include name="IDR_THEME_TOOLBAR_INACTIVE" file="theme_toolbar_default_i nactive2.png" type="BINDATA" /> 129 <include name="IDR_THEME_TOOLBAR_INACTIVE" file="theme_toolbar_default_i nactive2.png" type="BINDATA" />
142 </if> 130 </if>
143 <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BIN DATA" /> 131 <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BIN DATA" />
144 <include name="IDR_TOOLS" file="tools.png" type="BINDATA" /> 132 <include name="IDR_TOOLS" file="tools.png" type="BINDATA" />
145 <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" /> 133 <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" />
146 <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" /> 134 <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" />
147 </includes> 135 </includes>
148 </release> 136 </release>
149 </grit> 137 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources_large.grd ('k') | chrome/browser/ui/views/bubble/bubble_border.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698