diff options
author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 00:32:58 +0000 |
---|---|---|
committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 00:32:58 +0000 |
commit | 672ca8c92a76d9a4dfdf1bb9c017bef416157fab (patch) | |
tree | e07b1bbabf0a9fe4bff4e6085aa1134c8aff63e8 /ui/resources | |
parent | 672dcd2fc7d0b1b2389e080b8a4dec6898e4bb45 (diff) | |
download | chromium_src-672ca8c92a76d9a4dfdf1bb9c017bef416157fab.zip chromium_src-672ca8c92a76d9a4dfdf1bb9c017bef416157fab.tar.gz chromium_src-672ca8c92a76d9a4dfdf1bb9c017bef416157fab.tar.bz2 |
Implement new volume mute button.
Add a new TrayBarButtonWithTitle class which can be used for both audio and brightness UI for toggle audio/brightness state.
Clip the extra empty space around left/right bar images so that the bar image would not have too much empty space around itself.
The new audio/brightness slider will be implemented in another cl.
BUG=122832
TEST=The new mute segment should show up and work on uber tray bubble.
TBR=oshima@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10808080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
-rw-r--r-- | ui/resources/ui_resources.grd | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index 1ece7c9..e2c9970 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -154,7 +154,13 @@ <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="ash/status_update_dark.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="ash/status_volume_dark.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="ash/status_volume_mute.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="ash/statusbar_notifications.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BAR_BUTTON_ACTIVE_CENTER" file="ash/slider_center_active.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BAR_BUTTON_ACTIVE_LEFT" file="ash/slider_left_active.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BAR_BUTTON_ACTIVE_RIGHT" file="ash/slider_right_active.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BAR_BUTTON_DISABLED_CENTER" file="ash/slider_center_disabled.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BAR_BUTTON_DISABLED_LEFT" file="ash/slider_left_disabled.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BAR_BUTTON_DISABLED_RIGHT" file="ash/slider_right_disabled.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="ash/statusbar_notifications.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="ash/status_wifi_disabled.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="ash/status_wifi_disabled_h.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="ash/status_wifi_enabled.png" /> |