summaryrefslogtreecommitdiffstats
path: root/chrome/app/theme
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-06 22:08:46 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-06 22:08:46 +0000
commite9cd4f0316b92e8c2b9277ae5d2ce3f42836720a (patch)
tree08c2cbf398035a79a6ff37f4baf0dfd84f2e7485 /chrome/app/theme
parent81bf14642cc1362edcd4073c8ef6abbbaaf2cabe (diff)
downloadchromium_src-e9cd4f0316b92e8c2b9277ae5d2ce3f42836720a.zip
chromium_src-e9cd4f0316b92e8c2b9277ae5d2ce3f42836720a.tar.gz
chromium_src-e9cd4f0316b92e8c2b9277ae5d2ce3f42836720a.tar.bz2
chromeos: Add support for multiple volume icons.
This makes us the appropriate icon depending on whether the volume is increasing, decreasing, or muted. BUG=chromium-os:8473 TEST=built it and tried the volume up, down, and mute keys in various combinations Review URL: http://codereview.chromium.org/5559004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme')
-rw-r--r--chrome/app/theme/theme_resources.grd4
-rw-r--r--chrome/app/theme/volume_icon.pngbin405 -> 0 bytes
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 1f066d9..df00c32 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -584,7 +584,9 @@
<include name="IDR_USER_IMAGE_RECYCLE" file="discard_wide.png" type="BINDATA" />
<include name="IDR_USER_IMAGE_CAPTURE_DISABLED" file="snapshot_wide_disabled.png" type="BINDATA" />
<include name="IDR_USER_IMAGE_INITIALIZING" file="initializing_video.png" type="BINDATA" />
- <include name="IDR_VOLUMEBUBBLE_ICON" file="volume_icon.png" type="BINDATA" />
+ <include name="IDR_VOLUME_BUBBLE_UP_ICON" file="volume_up_icon.png" type="BINDATA" />
+ <include name="IDR_VOLUME_BUBBLE_DOWN_ICON" file="volume_down_icon.png" type="BINDATA" />
+ <include name="IDR_VOLUME_BUBBLE_MUTE_ICON" file="volume_mute_icon.png" type="BINDATA" />
<include name="IDR_SCROLL_BACKGROUND" file="chromeos_scroll_background.png" type="BINDATA" />
<include name="IDR_SCROLL_BACKGROUND_BORDER_UP" file="chromeos_scroll_background_border_up.png" type="BINDATA" />
<include name="IDR_SCROLL_BACKGROUND_BORDER_DOWN" file="chromeos_scroll_background_border_down.png" type="BINDATA" />
diff --git a/chrome/app/theme/volume_icon.png b/chrome/app/theme/volume_icon.png
deleted file mode 100644
index 1166fff..0000000
--- a/chrome/app/theme/volume_icon.png
+++ /dev/null
Binary files differ