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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10830027: Implement new slider control and disable the volume control when audio is muted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move enum from .h to .cc. Created 8 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/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | ui/views/controls/slider.h » ('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/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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMA LL" file="ash/status_power_small_all.png" /> 147 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMA LL" file="ash/status_power_small_all.png" />
148 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMA LL_DARK" file="ash/status_power_small_all_dark.png" /> 148 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMA LL_DARK" file="ash/status_power_small_all_dark.png" />
149 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" file="ash/status_settings.png" /> 149 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" file="ash/status_settings.png" />
150 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="ash/status_shutdown.png" /> 150 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="ash/status_shutdown.png" />
151 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN_ HOVER" file="ash/status_shutdown_h.png" /> 151 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN_ HOVER" file="ash/status_shutdown_h.png" />
152 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file ="ash/status_sms.png" /> 152 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file ="ash/status_sms.png" />
153 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE" f ile="ash/status_update.png" /> 153 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE" f ile="ash/status_update.png" />
154 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DA RK" file="ash/status_update_dark.png" /> 154 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DA RK" file="ash/status_update_dark.png" />
155 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_LE VELS" file="ash/status_volume_dark.png" /> 155 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_LE VELS" file="ash/status_volume_dark.png" />
156 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_MU TE" file="ash/status_volume_mute.png" /> 156 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_MU TE" file="ash/status_volume_mute.png" />
157 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BAR_BUTTO N_ACTIVE_CENTER" file="ash/slider_center_active.png" />
158 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BAR_BUTTO N_ACTIVE_LEFT" file="ash/slider_left_active.png" />
159 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BAR_BUTTO N_ACTIVE_RIGHT" file="ash/slider_right_active.png" />
160 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BAR_BUTTO N_DISABLED_CENTER" file="ash/slider_center_disabled.png" />
161 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BAR_BUTTO N_DISABLED_LEFT" file="ash/slider_left_disabled.png" />
162 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BAR_BUTTO N_DISABLED_RIGHT" file="ash/slider_right_disabled.png" />
163 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WEB_NOTIF ICATON" file="ash/statusbar_notifications.png" /> 157 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WEB_NOTIF ICATON" file="ash/statusbar_notifications.png" />
164 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED" file="ash/status_wifi_disabled.png" /> 158 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED" file="ash/status_wifi_disabled.png" />
165 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED_HOVER" file="ash/status_wifi_disabled_h.png" /> 159 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED_HOVER" file="ash/status_wifi_disabled_h.png" />
166 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED" file="ash/status_wifi_enabled.png" /> 160 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED" file="ash/status_wifi_enabled.png" />
167 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED_HOVER" file="ash/status_wifi_enabled_h.png" /> 161 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED_HOVER" file="ash/status_wifi_enabled_h.png" />
168 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_CL OSE" file="ash/status_notify_x.png" /> 162 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_CL OSE" file="ash/status_notify_x.png" />
169 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_BUTTON_SEPAR ATOR" file="aura/window_button_separator.png" /> 163 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_BUTTON_SEPAR ATOR" file="aura/window_button_separator.png" />
170 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE" file= "aura/window_close_normal.png" /> 164 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE" file= "aura/window_close_normal.png" />
171 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_H" fil e="aura/window_close_hover.png" /> 165 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_H" fil e="aura/window_close_hover.png" />
172 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_ICON" file="aura/slab_close.png" /> 166 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_ICON" file="aura/slab_close.png" />
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE" file="linux_ma ximize.png" /> 323 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE" file="linux_ma ximize.png" />
330 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_H" file="linux_ maximize_hover.png" /> 324 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_H" file="linux_ maximize_hover.png" />
331 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_P" file="linux_ maximize_pressed.png" /> 325 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_P" file="linux_ maximize_pressed.png" />
332 </if> 326 </if>
333 <if expr="pp_ifdef('toolkit_views')"> 327 <if expr="pp_ifdef('toolkit_views')">
334 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE" file="maximize .png" /> 328 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE" file="maximize .png" />
335 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_H" file="maximi ze_hover.png" /> 329 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_H" file="maximi ze_hover.png" />
336 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_P" file="maximi ze_pressed.png" /> 330 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_P" file="maximi ze_pressed.png" />
337 <structure type="chrome_scaled_image" name="IDR_MENU_ARROW" file="menu_a rrow.png" /> 331 <structure type="chrome_scaled_image" name="IDR_MENU_ARROW" file="menu_a rrow.png" />
338 <structure type="chrome_scaled_image" name="IDR_MENU_CHECK" file="menu_c heck.png" /> 332 <structure type="chrome_scaled_image" name="IDR_MENU_CHECK" file="menu_c heck.png" />
333 <structure type="chrome_scaled_image" name="IDR_SLIDER_ACTIVE_LEFT" file ="slider_left_active.png" />
334 <structure type="chrome_scaled_image" name="IDR_SLIDER_ACTIVE_RIGHT" fil e="slider_right_active.png" />
335 <structure type="chrome_scaled_image" name="IDR_SLIDER_ACTIVE_CENTER" fi le="slider_center_active.png" />
336 <structure type="chrome_scaled_image" name="IDR_SLIDER_DISABLED_LEFT" fi le="slider_left_disabled.png" />
337 <structure type="chrome_scaled_image" name="IDR_SLIDER_DISABLED_RIGHT" f ile="slider_right_disabled.png" />
338 <structure type="chrome_scaled_image" name="IDR_SLIDER_DISABLED_CENTER" file="slider_center_disabled.png" />
339 <structure type="chrome_scaled_image" name="IDR_SLIDER_PRESSED_LEFT" fil e="slider_left_pressed.png" />
340 <structure type="chrome_scaled_image" name="IDR_SLIDER_PRESSED_RIGHT" fi le="slider_right_pressed.png" />
341 <structure type="chrome_scaled_image" name="IDR_SLIDER_PRESSED_CENTER" f ile="slider_center_pressed.png" />
342 <structure type="chrome_scaled_image" name="IDR_SLIDER_ACTIVE_THUMB" fil e="slider_thumb.png" />
343 <structure type="chrome_scaled_image" name="IDR_SLIDER_DISABLED_THUMB" f ile="slider_thumb_disabled.png" />
339 </if> 344 </if>
340 <structure type="chrome_scaled_image" name="IDR_MENU_DROPARROW" file="menu _droparrow.png" /> 345 <structure type="chrome_scaled_image" name="IDR_MENU_DROPARROW" file="menu _droparrow.png" />
341 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> 346 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
342 <structure type="chrome_scaled_image" name="IDR_MINIMIZE" file="linux_mi nimize.png" /> 347 <structure type="chrome_scaled_image" name="IDR_MINIMIZE" file="linux_mi nimize.png" />
343 <structure type="chrome_scaled_image" name="IDR_MINIMIZE_H" file="linux_ minimize_hover.png" /> 348 <structure type="chrome_scaled_image" name="IDR_MINIMIZE_H" file="linux_ minimize_hover.png" />
344 <structure type="chrome_scaled_image" name="IDR_MINIMIZE_P" file="linux_ minimize_pressed.png" /> 349 <structure type="chrome_scaled_image" name="IDR_MINIMIZE_P" file="linux_ minimize_pressed.png" />
345 </if> 350 </if>
346 <if expr="pp_ifdef('toolkit_views')"> 351 <if expr="pp_ifdef('toolkit_views')">
347 <structure type="chrome_scaled_image" name="IDR_MINIMIZE" file="minimize .png" /> 352 <structure type="chrome_scaled_image" name="IDR_MINIMIZE" file="minimize .png" />
348 <structure type="chrome_scaled_image" name="IDR_MINIMIZE_H" file="minimi ze_hover.png" /> 353 <structure type="chrome_scaled_image" name="IDR_MINIMIZE_H" file="minimi ze_hover.png" />
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5" file="aura/wallpapers/5- gradient5.png" type="BINDATA" /> 535 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5" file="aura/wallpapers/5- gradient5.png" type="BINDATA" />
531 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_THUMB" file="aura/wallpap ers/5-gradient5_thumb.png" type="BINDATA" /> 536 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_THUMB" file="aura/wallpap ers/5-gradient5_thumb.png" type="BINDATA" />
532 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6" file="aura/wallpapers/5- gradient6.png" type="BINDATA" /> 537 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6" file="aura/wallpapers/5- gradient6.png" type="BINDATA" />
533 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_THUMB" file="aura/wallpap ers/5-gradient6_thumb.png" type="BINDATA" /> 538 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_THUMB" file="aura/wallpap ers/5-gradient6_thumb.png" type="BINDATA" />
534 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7" file="aura/wallpapers/5- gradient7.png" type="BINDATA" /> 539 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7" file="aura/wallpapers/5- gradient7.png" type="BINDATA" />
535 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_THUMB" file="aura/wallpap ers/5-gradient7_thumb.png" type="BINDATA" /> 540 <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_THUMB" file="aura/wallpap ers/5-gradient7_thumb.png" type="BINDATA" />
536 </if> 541 </if>
537 </includes> 542 </includes>
538 </release> 543 </release>
539 </grit> 544 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | ui/views/controls/slider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698