summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-30 22:48:47 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-30 22:48:47 +0000
commit77f12534e9f42cbea956e3cce9ec509f4edd0f00 (patch)
tree2509bc10dd48f90e702e893e47c418be1b058634 /webkit
parent8388adaf8d1ae2d3793c18bb878daadd91f408c7 (diff)
downloadchromium_src-77f12534e9f42cbea956e3cce9ec509f4edd0f00.zip
chromium_src-77f12534e9f42cbea956e3cce9ec509f4edd0f00.tar.gz
chromium_src-77f12534e9f42cbea956e3cce9ec509f4edd0f00.tar.bz2
Provide media slider thumb image for media controls panel
Review URL: http://codereview.chromium.org/160415 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rwxr-xr-xwebkit/glue/resources/media_slider_thumb.pngbin0 -> 324 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_slider_thumb.png b/webkit/glue/resources/media_slider_thumb.png
new file mode 100755
index 0000000..21909ce
--- /dev/null
+++ b/webkit/glue/resources/media_slider_thumb.png
Binary files differ
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index bbd40b6..a2fe383 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -25,6 +25,7 @@
<include name="IDR_MEDIA_PAUSE_BUTTON" file="resources\media_pause.png" type="BINDATA" />
<include name="IDR_MEDIA_SOUND_FULL_BUTTON" file="resources\media_sound_full.png" type="BINDATA" />
<include name="IDR_MEDIA_SOUND_NONE_BUTTON" file="resources\media_sound_none.png" type="BINDATA" />
+ <include name="IDR_MEDIA_SLIDER_THUMB" file="resources\media_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 78c52be..9a19bf5 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -160,6 +160,7 @@ WebData WebKitClientImpl::loadResource(const char* name) {
{ "mediaPause", IDR_MEDIA_PAUSE_BUTTON },
{ "mediaSoundFull", IDR_MEDIA_SOUND_FULL_BUTTON },
{ "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON },
+ { "mediaSliderThumb", IDR_MEDIA_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 c0dc1e6..5d7cd66 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -742,6 +742,7 @@ StringPiece GetDataResource(int resource_id) {
case IDR_MEDIA_PLAY_BUTTON:
case IDR_MEDIA_SOUND_FULL_BUTTON:
case IDR_MEDIA_SOUND_NONE_BUTTON:
+ case IDR_MEDIA_SLIDER_THUMB:
return NetResourceProvider(resource_id);
default: