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

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

Issue 9814013: Ash: Update tab strip for new image assets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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_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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_ove rflow_p.png" type="BINDATA" /> 62 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_ove rflow_p.png" type="BINDATA" />
63 </if> 63 </if>
64 <if expr="is_win and not pp_ifdef('use_ash')"> 64 <if expr="is_win and not pp_ifdef('use_ash')">
65 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overf low_win.png" type="BINDATA" /> 65 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overf low_win.png" type="BINDATA" />
66 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_ove rflow_win_h.png" type="BINDATA" /> 66 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_ove rflow_win_h.png" type="BINDATA" />
67 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_ove rflow_win_p.png" type="BINDATA" /> 67 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_ove rflow_win_p.png" type="BINDATA" />
68 </if> 68 </if>
69 <if expr="is_win"> 69 <if expr="is_win">
70 <include name="IDR_CONFLICT_FAVICON" file="about_conflicts_favicon.png" type="BINDATA" /> 70 <include name="IDR_CONFLICT_FAVICON" file="about_conflicts_favicon.png" type="BINDATA" />
71 </if> 71 </if>
72 <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type= "BINDATA" /> 72 <if expr="pp_ifdef('use_ash')">
73 <include name="IDR_CONTENT_TOP_CENTER" file="ash/content_top_center.png" type="BINDATA" />
74 </if>
75 <if expr="not pp_ifdef('use_ash')">
76 <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" typ e="BINDATA" />
77 </if>
73 <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner. png" type="BINDATA" /> 78 <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner. png" type="BINDATA" />
74 <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_co rner_mask.png" type="BINDATA" /> 79 <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_co rner_mask.png" type="BINDATA" />
75 <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corne r.png" type="BINDATA" /> 80 <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corne r.png" type="BINDATA" />
76 <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="content_top_right_ corner_mask.png" type="BINDATA" /> 81 <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="content_top_right_ corner_mask.png" type="BINDATA" />
77 <include name="IDR_DOWNLOADS_FAVICON" file="downloads_favicon.png" type="B INDATA" /> 82 <include name="IDR_DOWNLOADS_FAVICON" file="downloads_favicon.png" type="B INDATA" />
78 <include name="IDR_FEEDBACK" file="feedback.png" type="BINDATA" /> 83 <include name="IDR_FEEDBACK" file="feedback.png" type="BINDATA" />
79 <include name="IDR_FEEDBACK_H" file="feedback_h.png" type="BINDATA" /> 84 <include name="IDR_FEEDBACK_H" file="feedback_h.png" type="BINDATA" />
80 <include name="IDR_FEEDBACK_P" file="feedback_p.png" type="BINDATA" /> 85 <include name="IDR_FEEDBACK_P" file="feedback_p.png" type="BINDATA" />
81 <include name="IDR_FLAGS" file="flags.png" type="BINDATA" /> 86 <include name="IDR_FLAGS" file="flags.png" type="BINDATA" />
82 <if expr="pp_ifdef('use_ash')"> 87 <if expr="pp_ifdef('use_ash')">
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 <include name="IDR_LOCATIONBG_C" file="omnibox_c.png" type="BINDATA" /> 137 <include name="IDR_LOCATIONBG_C" file="omnibox_c.png" type="BINDATA" />
133 <include name="IDR_LOCATIONBG_L" file="omnibox_l.png" type="BINDATA" /> 138 <include name="IDR_LOCATIONBG_L" file="omnibox_l.png" type="BINDATA" />
134 <include name="IDR_LOCATIONBG_R" file="omnibox_r.png" type="BINDATA" /> 139 <include name="IDR_LOCATIONBG_R" file="omnibox_r.png" type="BINDATA" />
135 <include name="IDR_LOCATION_BAR_BORDER" file="omnibox_border.png" type=" BINDATA" /> 140 <include name="IDR_LOCATION_BAR_BORDER" file="omnibox_border.png" type=" BINDATA" />
136 </if> 141 </if>
137 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="keywo rd_search_bubble_c.png" type="BINDATA" /> 142 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="keywo rd_search_bubble_c.png" type="BINDATA" />
138 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="keywo rd_search_bubble_l.png" type="BINDATA" /> 143 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="keywo rd_search_bubble_l.png" type="BINDATA" />
139 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="keywo rd_search_bubble_r.png" type="BINDATA" /> 144 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="keywo rd_search_bubble_r.png" type="BINDATA" />
140 <include name="IDR_MOBILE" file="mobile.png" type="BINDATA" /> 145 <include name="IDR_MOBILE" file="mobile.png" type="BINDATA" />
141 <include name="IDR_MOBILE_LIT" file="mobile_lit.png" type="BINDATA" /> 146 <include name="IDR_MOBILE_LIT" file="mobile_lit.png" type="BINDATA" />
142 <if expr="pp_ifdef('toolkit_views')"> 147 <if expr="pp_ifdef('use_ash')">
148 <include name="IDR_NEWTAB_BUTTON" file="ash/newtab_normal.png" type="BIN DATA" />
149 <include name="IDR_NEWTAB_BUTTON_H" file="ash/newtab_hot.png" type="BIND ATA" />
150 <include name="IDR_NEWTAB_BUTTON_P" file="ash/newtab_pressed.png" type=" BINDATA" />
151 <include name="IDR_NEWTAB_BUTTON_MASK" file="ash/newtab_button_mask.png" type="BINDATA" />
152 </if>
153 <if expr="not pp_ifdef('use_ash') and pp_ifdef('toolkit_views')">
143 <include name="IDR_NEWTAB_BUTTON" file="newtab_views.png" type="BINDATA" /> 154 <include name="IDR_NEWTAB_BUTTON" file="newtab_views.png" type="BINDATA" />
155 <!-- No hot state. -->
144 <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p_views.png" type="BIND ATA" /> 156 <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p_views.png" type="BIND ATA" />
157 <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" typ e="BINDATA" />
145 </if> 158 </if>
146 <if expr="not pp_ifdef('toolkit_views')"> 159 <if expr="not pp_ifdef('use_ash') and not pp_ifdef('toolkit_views')">
147 <include name="IDR_NEWTAB_BUTTON" file="newtab.png" type="BINDATA" /> 160 <include name="IDR_NEWTAB_BUTTON" file="newtab.png" type="BINDATA" />
148 <include name="IDR_NEWTAB_BUTTON_H" file="newtab_h.png" type="BINDATA" / > 161 <include name="IDR_NEWTAB_BUTTON_H" file="newtab_h.png" type="BINDATA" / >
149 <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.png" type="BINDATA" / > 162 <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.png" type="BINDATA" / >
163 <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" typ e="BINDATA" />
150 </if> 164 </if>
151 <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" type= "BINDATA" />
152 <include name="IDR_SETTINGS_FAVICON" file="settings_favicon.png" type="BIN DATA" /> 165 <include name="IDR_SETTINGS_FAVICON" file="settings_favicon.png" type="BIN DATA" />
153 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="ev_bubble_c.png" type="BINDATA" /> 166 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="ev_bubble_c.png" type="BINDATA" />
154 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="ev_bubble_l.png" type="BINDATA" /> 167 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="ev_bubble_l.png" type="BINDATA" />
155 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="ev_bubble_r.png" type="BINDATA" /> 168 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="ev_bubble_r.png" type="BINDATA" />
156 <include name="IDR_PLUGIN" file="plugin.png" type="BINDATA" /> 169 <include name="IDR_PLUGIN" file="plugin.png" type="BINDATA" />
157 <if expr="pp_ifdef('use_ash')"> 170 <if expr="pp_ifdef('use_ash')">
158 <include name="IDR_RELOAD" file="ash/browser_reload_normal.png" type="BI NDATA" /> 171 <include name="IDR_RELOAD" file="ash/browser_reload_normal.png" type="BI NDATA" />
159 <include name="IDR_RELOAD_H" file="ash/browser_reload_hot.png" type="BIN DATA" /> 172 <include name="IDR_RELOAD_H" file="ash/browser_reload_hot.png" type="BIN DATA" />
160 <include name="IDR_RELOAD_P" file="ash/browser_reload_pressed.png" type= "BINDATA" /> 173 <include name="IDR_RELOAD_P" file="ash/browser_reload_pressed.png" type= "BINDATA" />
161 </if> 174 </if>
(...skipping 10 matching lines...) Expand all
172 <include name="IDR_STOP_D" file="ash/browser_stop_disabled.png" type="BI NDATA" /> 185 <include name="IDR_STOP_D" file="ash/browser_stop_disabled.png" type="BI NDATA" />
173 <include name="IDR_STOP_H" file="ash/browser_stop_hot.png" type="BINDATA " /> 186 <include name="IDR_STOP_H" file="ash/browser_stop_hot.png" type="BINDATA " />
174 <include name="IDR_STOP_P" file="ash/browser_stop_pressed.png" type="BIN DATA" /> 187 <include name="IDR_STOP_P" file="ash/browser_stop_pressed.png" type="BIN DATA" />
175 </if> 188 </if>
176 <if expr="not pp_ifdef('use_ash')"> 189 <if expr="not pp_ifdef('use_ash')">
177 <include name="IDR_STOP" file="stop.png" type="BINDATA" /> 190 <include name="IDR_STOP" file="stop.png" type="BINDATA" />
178 <include name="IDR_STOP_D" file="stop_d.png" type="BINDATA" /> 191 <include name="IDR_STOP_D" file="stop_d.png" type="BINDATA" />
179 <include name="IDR_STOP_H" file="stop_h.png" type="BINDATA" /> 192 <include name="IDR_STOP_H" file="stop_h.png" type="BINDATA" />
180 <include name="IDR_STOP_P" file="stop_p.png" type="BINDATA" /> 193 <include name="IDR_STOP_P" file="stop_p.png" type="BINDATA" />
181 </if> 194 </if>
182 <include name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" type="B INDATA" /> 195 <if expr="pp_ifdef('use_ash')">
183 <include name="IDR_TAB_ACTIVE_LEFT" file="tab_active_left.png" type="BINDA TA" /> 196 <include name="IDR_TAB_ACTIVE_CENTER" file="ash/tab_active_center.png" t ype="BINDATA" />
184 <include name="IDR_TAB_ACTIVE_RIGHT" file="tab_active_right.png" type="BIN DATA" /> 197 <include name="IDR_TAB_ACTIVE_LEFT" file="ash/tab_active_left.png" type= "BINDATA" />
185 <include name="IDR_TAB_ALPHA_LEFT" file="tab_alpha_left.png" type="BINDATA " /> 198 <include name="IDR_TAB_ACTIVE_RIGHT" file="ash/tab_active_right.png" typ e="BINDATA" />
186 <include name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right.png" type="BINDA TA" /> 199 <include name="IDR_TAB_ALPHA_LEFT" file="ash/tab_alpha_left.png" type="B INDATA" />
200 <include name="IDR_TAB_ALPHA_RIGHT" file="ash/tab_alpha_right.png" type= "BINDATA" />
201 </if>
202 <if expr="not pp_ifdef('use_ash')">
203 <include name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" type= "BINDATA" />
204 <include name="IDR_TAB_ACTIVE_LEFT" file="tab_active_left.png" type="BIN DATA" />
205 <include name="IDR_TAB_ACTIVE_RIGHT" file="tab_active_right.png" type="B INDATA" />
206 <include name="IDR_TAB_ALPHA_LEFT" file="tab_alpha_left.png" type="BINDA TA" />
207 <include name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right.png" type="BIN DATA" />
208 </if>
187 <include name="IDR_TAB_CLOSE" file="tab_close.png" type="BINDATA" /> 209 <include name="IDR_TAB_CLOSE" file="tab_close.png" type="BINDATA" />
188 <include name="IDR_TAB_CLOSE_H" file="tab_close_h.png" type="BINDATA" /> 210 <include name="IDR_TAB_CLOSE_H" file="tab_close_h.png" type="BINDATA" />
189 <include name="IDR_TAB_CLOSE_MASK" file="tab_close_mask.png" type="BINDATA " /> 211 <include name="IDR_TAB_CLOSE_MASK" file="tab_close_mask.png" type="BINDATA " />
190 <include name="IDR_TAB_CLOSE_P" file="tab_close_p.png" type="BINDATA" /> 212 <include name="IDR_TAB_CLOSE_P" file="tab_close_p.png" type="BINDATA" />
191 <include name="IDR_TAB_DROP_DOWN" file="tab_drop_down.png" type="BINDATA" /> 213 <include name="IDR_TAB_DROP_DOWN" file="tab_drop_down.png" type="BINDATA" />
192 <include name="IDR_TAB_DROP_UP" file="tab_drop_up.png" type="BINDATA" /> 214 <include name="IDR_TAB_DROP_UP" file="tab_drop_up.png" type="BINDATA" />
193 <include name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center.png" typ e="BINDATA" /> 215 <if expr="pp_ifdef('use_ash')">
194 <include name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left.png" type="B INDATA" /> 216 <include name="IDR_TAB_INACTIVE_CENTER" file="ash/tab_inactive_center.pn g" type="BINDATA" />
195 <include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right.png" type= "BINDATA" /> 217 <include name="IDR_TAB_INACTIVE_LEFT" file="ash/tab_inactive_left.png" t ype="BINDATA" />
218 <include name="IDR_TAB_INACTIVE_RIGHT" file="ash/tab_inactive_right.png" type="BINDATA" />
219 </if>
220 <if expr="not pp_ifdef('use_ash')">
221 <include name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center.png" t ype="BINDATA" />
222 <include name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left.png" type= "BINDATA" />
223 <include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right.png" typ e="BINDATA" />
224 </if>
196 <if expr="pp_ifdef('use_ash')"> 225 <if expr="pp_ifdef('use_ash')">
197 <include name="IDR_THEME_FRAME" file="ash/theme_frame.png" type="BINDATA " /> 226 <include name="IDR_THEME_FRAME" file="ash/theme_frame.png" type="BINDATA " />
198 <include name="IDR_THEME_FRAME_INACTIVE" file="ash/theme_frame_inactive. png" type="BINDATA" /> 227 <include name="IDR_THEME_FRAME_INACTIVE" file="ash/theme_frame_inactive. png" type="BINDATA" />
199 <include name="IDR_THEME_FRAME_INCOGNITO" file="ash/theme_frame_incognit o.png" type="BINDATA" /> 228 <include name="IDR_THEME_FRAME_INCOGNITO" file="ash/theme_frame_incognit o.png" type="BINDATA" />
200 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="ash/theme_frame _incognito_inactive.png" type="BINDATA" /> 229 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="ash/theme_frame _incognito_inactive.png" type="BINDATA" />
201 </if> 230 </if>
202 <if expr="not pp_ifdef('use_ash')"> 231 <if expr="not pp_ifdef('use_ash')">
203 <include name="IDR_THEME_FRAME" file="theme_frame.png" type="BINDATA" /> 232 <include name="IDR_THEME_FRAME" file="theme_frame.png" type="BINDATA" />
204 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_inactive.png" type="BINDATA" /> 233 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_inactive.png" type="BINDATA" />
205 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_incognito.pn g" type="BINDATA" /> 234 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_incognito.pn g" type="BINDATA" />
206 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_inc ognito_inactive.png" type="BINDATA" /> 235 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_inc ognito_inactive.png" type="BINDATA" />
207 </if> 236 </if>
208 <if expr="pp_ifdef('use_ash')"> 237 <if expr="pp_ifdef('use_ash')">
209 <include name="IDR_THEME_TAB_BACKGROUND" file="ash/theme_tab_background. png" type="BINDATA" /> 238 <include name="IDR_THEME_TAB_BACKGROUND" file="ash/theme_tab_background. png" type="BINDATA" />
210 </if> 239 </if>
211 <if expr="not pp_ifdef('use_ash')"> 240 <if expr="not pp_ifdef('use_ash')">
212 <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" /> 241 <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" />
213 </if> 242 </if>
214 <if expr="pp_ifdef('use_ash') or is_macosx"> 243 <if expr="pp_ifdef('use_ash')">
244 <include name="IDR_THEME_TOOLBAR" file="ash/theme_toolbar_default.png" t ype="BINDATA" />
245 </if>
246 <if expr="not pp_ifdef('use_ash') and is_macosx">
215 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default2.png" type ="BINDATA" /> 247 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default2.png" type ="BINDATA" />
216 </if> 248 </if>
217 <if expr="not pp_ifdef('use_ash') and not is_macosx"> 249 <if expr="not pp_ifdef('use_ash') and not is_macosx">
218 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type= "BINDATA" /> 250 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type= "BINDATA" />
219 </if> 251 </if>
220 <if expr="is_macosx"> 252 <if expr="is_macosx">
221 <include name="IDR_THEME_TOOLBAR_INACTIVE" file="theme_toolbar_default_i nactive2.png" type="BINDATA" /> 253 <include name="IDR_THEME_TOOLBAR_INACTIVE" file="theme_toolbar_default_i nactive2.png" type="BINDATA" />
222 </if> 254 </if>
223 <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BIN DATA" /> 255 <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BIN DATA" />
224 <include name="IDR_TOOLS" file="tools.png" type="BINDATA" /> 256 <include name="IDR_TOOLS" file="tools.png" type="BINDATA" />
225 <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" /> 257 <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" />
226 <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" /> 258 <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" />
227 </includes> 259 </includes>
228 </release> 260 </release>
229 </grit> 261 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources_2x.grd ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698