summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-21 22:41:49 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-21 22:41:49 +0000
commit083a8ceb8ab236e0710c40357409b5dda18f580b (patch)
tree0f7b7b392675414bfe6f3e649dbb24fdc67cacfd
parent21f9414ce35d4c1548fe6e9179a701701436c578 (diff)
downloadchromium_src-083a8ceb8ab236e0710c40357409b5dda18f580b.zip
chromium_src-083a8ceb8ab236e0710c40357409b5dda18f580b.tar.gz
chromium_src-083a8ceb8ab236e0710c40357409b5dda18f580b.tar.bz2
Adding image for volume slider thumb
BUG=18973 Volume silder thumb image for media controls. Review URL: http://codereview.chromium.org/173139 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24035 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xwebkit/glue/resources/media_volume_slider_thumb.pngbin0 -> 100 bytes
-rw-r--r--webkit/glue/webkit_resources.grd1
-rw-r--r--webkit/glue/webkitclient_impl.cc1
-rw-r--r--webkit/tools/test_shell/test_shell_win.cc1
4 files changed, 3 insertions, 0 deletions
diff --git a/webkit/glue/resources/media_volume_slider_thumb.png b/webkit/glue/resources/media_volume_slider_thumb.png
new file mode 100755
index 0000000..4789937
--- /dev/null
+++ b/webkit/glue/resources/media_volume_slider_thumb.png
Binary files differ
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index 0286f23..f940b10b 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -29,6 +29,7 @@
<include name="IDR_MEDIA_SOUND_NONE_BUTTON" file="resources\media_sound_none.png" type="BINDATA" />
<include name="IDR_MEDIA_SOUND_DISABLED" file="resources\media_sound_disabled.png" type="BINDATA" />
<include name="IDR_MEDIA_SLIDER_THUMB" file="resources\media_slider_thumb.png" type="BINDATA" />
+ <include name="IDR_MEDIA_VOLUME_SLIDER_THUMB" file="resources\media_volume_slider_thumb.png" type="BINDATA" />
<if expr="os == 'linux2'">
<include name="IDR_LINUX_CHECKBOX_OFF" file="resources\linux-checkbox-off.png" type="BINDATA" />
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index d257d53..083de68 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -171,6 +171,7 @@ WebData WebKitClientImpl::loadResource(const char* name) {
{ "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON },
{ "mediaSoundDisabled", IDR_MEDIA_SOUND_DISABLED },
{ "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB },
+ { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB },
#if defined(OS_LINUX)
{ "linuxCheckboxOff", IDR_LINUX_CHECKBOX_OFF },
{ "linuxCheckboxOn", IDR_LINUX_CHECKBOX_ON },
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index d07e17d..8a463a1 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -745,6 +745,7 @@ StringPiece GetDataResource(int resource_id) {
case IDR_MEDIA_SOUND_NONE_BUTTON:
case IDR_MEDIA_SOUND_DISABLED:
case IDR_MEDIA_SLIDER_THUMB:
+ case IDR_MEDIA_VOLUME_SLIDER_THUMB:
return NetResourceProvider(resource_id);
default: