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

Side by Side Diff: ui/resources/ui_resources.grd

Issue 14189012: Use new Windows close icon and renamed expand icons in notifications. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | « ui/message_center/views/message_view.cc ('k') | no next file » | 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/ui_resources.h" type="rc_header" context="default_100 _percent"> 4 <output filename="grit/ui_resources.h" type="rc_header" context="default_100 _percent">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/ui_resources_map.cc" type="resource_map_source" conte xt="default_100_percent" /> 7 <output filename="grit/ui_resources_map.cc" type="resource_map_source" conte xt="default_100_percent" />
8 <output filename="grit/ui_resources_map.h" type="resource_map_header" contex t="default_100_percent" /> 8 <output filename="grit/ui_resources_map.h" type="resource_map_header" contex t="default_100_percent" />
9 <!-- TODO(oshima): Remove gfx_resources.pak once DumpRenderTree.gyp 9 <!-- TODO(oshima): Remove gfx_resources.pak once DumpRenderTree.gyp
10 is updated. --> 10 is updated. -->
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 <structure type="chrome_scaled_image" name="IDR_SLIDER_DISABLED_LEFT" fi le="slider_left_disabled.png" /> 226 <structure type="chrome_scaled_image" name="IDR_SLIDER_DISABLED_LEFT" fi le="slider_left_disabled.png" />
227 <structure type="chrome_scaled_image" name="IDR_SLIDER_DISABLED_RIGHT" f ile="slider_right_disabled.png" /> 227 <structure type="chrome_scaled_image" name="IDR_SLIDER_DISABLED_RIGHT" f ile="slider_right_disabled.png" />
228 <structure type="chrome_scaled_image" name="IDR_SLIDER_DISABLED_CENTER" file="slider_center_disabled.png" /> 228 <structure type="chrome_scaled_image" name="IDR_SLIDER_DISABLED_CENTER" file="slider_center_disabled.png" />
229 <structure type="chrome_scaled_image" name="IDR_SLIDER_PRESSED_LEFT" fil e="slider_left_pressed.png" /> 229 <structure type="chrome_scaled_image" name="IDR_SLIDER_PRESSED_LEFT" fil e="slider_left_pressed.png" />
230 <structure type="chrome_scaled_image" name="IDR_SLIDER_PRESSED_RIGHT" fi le="slider_right_pressed.png" /> 230 <structure type="chrome_scaled_image" name="IDR_SLIDER_PRESSED_RIGHT" fi le="slider_right_pressed.png" />
231 <structure type="chrome_scaled_image" name="IDR_SLIDER_PRESSED_CENTER" f ile="slider_center_pressed.png" /> 231 <structure type="chrome_scaled_image" name="IDR_SLIDER_PRESSED_CENTER" f ile="slider_center_pressed.png" />
232 <structure type="chrome_scaled_image" name="IDR_SLIDER_ACTIVE_THUMB" fil e="slider_thumb.png" /> 232 <structure type="chrome_scaled_image" name="IDR_SLIDER_ACTIVE_THUMB" fil e="slider_thumb.png" />
233 <structure type="chrome_scaled_image" name="IDR_SLIDER_DISABLED_THUMB" f ile="slider_thumb_disabled.png" /> 233 <structure type="chrome_scaled_image" name="IDR_SLIDER_DISABLED_THUMB" f ile="slider_thumb_disabled.png" />
234 </if> 234 </if>
235 <structure type="chrome_scaled_image" name="IDR_MENU_DROPARROW" file="cros /menu_droparrow.png" /> 235 <structure type="chrome_scaled_image" name="IDR_MENU_DROPARROW" file="cros /menu_droparrow.png" />
236 <structure type="chrome_scaled_image" name="IDR_MESSAGE_CLOSE" file="commo n/message_close.png" />
236 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> 237 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
237 <structure type="chrome_scaled_image" name="IDR_MINIMIZE" file="linux/li nux_minimize.png" /> 238 <structure type="chrome_scaled_image" name="IDR_MINIMIZE" file="linux/li nux_minimize.png" />
238 <structure type="chrome_scaled_image" name="IDR_MINIMIZE_H" file="linux/ linux_minimize_hover.png" /> 239 <structure type="chrome_scaled_image" name="IDR_MINIMIZE_H" file="linux/ linux_minimize_hover.png" />
239 <structure type="chrome_scaled_image" name="IDR_MINIMIZE_P" file="linux/ linux_minimize_pressed.png" /> 240 <structure type="chrome_scaled_image" name="IDR_MINIMIZE_P" file="linux/ linux_minimize_pressed.png" />
240 </if> 241 </if>
241 <if expr="pp_ifdef('toolkit_views')"> 242 <if expr="pp_ifdef('toolkit_views')">
242 <structure type="chrome_scaled_image" name="IDR_MINIMIZE" file="minimize .png" /> 243 <structure type="chrome_scaled_image" name="IDR_MINIMIZE" file="minimize .png" />
243 <structure type="chrome_scaled_image" name="IDR_MINIMIZE_H" file="minimi ze_hover.png" /> 244 <structure type="chrome_scaled_image" name="IDR_MINIMIZE_H" file="minimi ze_hover.png" />
244 <structure type="chrome_scaled_image" name="IDR_MINIMIZE_P" file="minimi ze_pressed.png" /> 245 <structure type="chrome_scaled_image" name="IDR_MINIMIZE_P" file="minimi ze_pressed.png" />
245 </if> 246 </if>
247 <if expr="is_win">
248 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE" file ="win/notification_close.png"/>
249 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_HOVER " file="win/notification_close_hover.png"/>
250 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_PRESS ED" file="win/notification_close_pressed.png"/>
251 </if>
252 <if expr="not is_win">
253 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE" file ="common/notification_close.png"/>
254 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_HOVER " file="common/notification_close_hover.png"/>
255 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_PRESS ED" file="common/notification_close_pressed.png"/>
256 </if>
257 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_EXPAND" file= "common/notification_expand.png"/>
258 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_EXPAND_HOVER" file="common/notification_expand_hover.png"/>
259 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_EXPAND_PRESSE D" file="common/notification_expand_pressed.png"/>
246 <if expr="pp_ifdef('use_aura')"> 260 <if expr="pp_ifdef('use_aura')">
247 <structure type="chrome_scaled_image" name="IDR_OAK" file="oak.png" /> 261 <structure type="chrome_scaled_image" name="IDR_OAK" file="oak.png" />
248 </if> 262 </if>
249 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_HOV ER" file="cros/action_box_button_hover.png" /> 263 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_HOV ER" file="cros/action_box_button_hover.png" />
250 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_NOR MAL" file="cros/action_box_button_normal.png" /> 264 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_NOR MAL" file="cros/action_box_button_normal.png" />
251 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_PRE SSED" file="cros/action_box_button_pressed.png" /> 265 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_PRE SSED" file="cros/action_box_button_pressed.png" />
252 <structure type="chrome_scaled_image" name="IDR_PANEL_TOP_LEFT_CORNER" fil e="panel_top_left_corner.png" /> 266 <structure type="chrome_scaled_image" name="IDR_PANEL_TOP_LEFT_CORNER" fil e="panel_top_left_corner.png" />
253 <structure type="chrome_scaled_image" name="IDR_PANEL_TOP_RIGHT_CORNER" fi le="panel_top_right_corner.png" /> 267 <structure type="chrome_scaled_image" name="IDR_PANEL_TOP_RIGHT_CORNER" fi le="panel_top_right_corner.png" />
254 <structure type="chrome_scaled_image" name="IDR_PANEL_BOTTOM_LEFT_CORNER" file="panel_bottom_left_corner.png" /> 268 <structure type="chrome_scaled_image" name="IDR_PANEL_BOTTOM_LEFT_CORNER" file="panel_bottom_left_corner.png" />
255 <structure type="chrome_scaled_image" name="IDR_PANEL_BOTTOM_RIGHT_CORNER" file="panel_bottom_right_corner.png" /> 269 <structure type="chrome_scaled_image" name="IDR_PANEL_BOTTOM_RIGHT_CORNER" file="panel_bottom_right_corner.png" />
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMALL _BOTTOM_RIGHT" file="common/window_bubble_shadow_small_bottom_right.png" /> 358 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMALL _BOTTOM_RIGHT" file="common/window_bubble_shadow_small_bottom_right.png" />
345 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMALL _LEFT" file="common/window_bubble_shadow_small_left.png" /> 359 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMALL _LEFT" file="common/window_bubble_shadow_small_left.png" />
346 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMALL _RIGHT" file="common/window_bubble_shadow_small_right.png" /> 360 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMALL _RIGHT" file="common/window_bubble_shadow_small_right.png" />
347 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMALL _TOP" file="common/window_bubble_shadow_small_top.png" /> 361 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMALL _TOP" file="common/window_bubble_shadow_small_top.png" />
348 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMALL _TOP_LEFT" file="common/window_bubble_shadow_small_top_left.png" /> 362 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMALL _TOP_LEFT" file="common/window_bubble_shadow_small_top_left.png" />
349 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMALL _TOP_RIGHT" file="common/window_bubble_shadow_small_top_right.png" /> 363 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMALL _TOP_RIGHT" file="common/window_bubble_shadow_small_top_right.png" />
350 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPIKE _SMALL_BOTTOM" file="common/window_bubble_shadow_spike_small_bottom.png" /> 364 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPIKE _SMALL_BOTTOM" file="common/window_bubble_shadow_spike_small_bottom.png" />
351 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPIKE _SMALL_LEFT" file="common/window_bubble_shadow_spike_small_left.png" /> 365 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPIKE _SMALL_LEFT" file="common/window_bubble_shadow_spike_small_left.png" />
352 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPIKE _SMALL_RIGHT" file="common/window_bubble_shadow_spike_small_right.png" /> 366 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPIKE _SMALL_RIGHT" file="common/window_bubble_shadow_spike_small_right.png" />
353 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPIKE _SMALL_TOP" file="common/window_bubble_shadow_spike_small_top.png" /> 367 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPIKE _SMALL_TOP" file="common/window_bubble_shadow_spike_small_top.png" />
354 <structure type="chrome_scaled_image" name="IDR_MESSAGE_CLOSE" file="commo n/message_close.png" />
355 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE" file=" common/notification_close.png"/>
356 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_HOVER" file="common/notification_close_hover.png"/>
357 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_PRESSED " file="common/notification_close_pressed.png"/>
358 <structure type="chrome_scaled_image" name="IDR_NOTIFICATIONS_EXPAND" file ="common/notifications_expand.png"/>
359 <structure type="chrome_scaled_image" name="IDR_NOTIFICATIONS_EXPAND_HOVER " file="common/notifications_expand_hover.png"/>
360 <structure type="chrome_scaled_image" name="IDR_NOTIFICATIONS_EXPAND_PRESS ED" file="common/notifications_expand_pressed.png"/>
361 </structures> 368 </structures>
362 </release> 369 </release>
363 </grit> 370 </grit>
OLDNEW
« no previous file with comments | « ui/message_center/views/message_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698