summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorannacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-21 17:35:10 +0000
committerannacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-21 17:35:10 +0000
commit8b2e5ecb8afb27b34c5ca327dcaca2fe651784b8 (patch)
treed42f9f41cec5889822e7aba96bfd20bfaaf47afd /webkit
parentac8b8781632ff70b10f4bb83826158290d5accf9 (diff)
downloadchromium_src-8b2e5ecb8afb27b34c5ca327dcaca2fe651784b8.zip
chromium_src-8b2e5ecb8afb27b34c5ca327dcaca2fe651784b8.tar.gz
chromium_src-8b2e5ecb8afb27b34c5ca327dcaca2fe651784b8.tar.bz2
Add new images for closed caption button.
BUG=143514 Review URL: https://chromiumcodereview.appspot.com/10855235 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152587 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/resources/default_100_percent/mediaplayer_closedcaption.pngbin0 -> 4289 bytes
-rw-r--r--webkit/glue/resources/default_100_percent/mediaplayer_closedcaption_disabled.pngbin0 -> 4144 bytes
-rw-r--r--webkit/glue/resources/default_100_percent/mediaplayer_closedcaption_down.pngbin0 -> 10366 bytes
-rw-r--r--webkit/glue/resources/default_100_percent/mediaplayer_closedcaption_hover.pngbin0 -> 9864 bytes
-rw-r--r--webkit/glue/resources/webkit_resources.grd4
-rw-r--r--webkit/glue/webkitplatformsupport_impl.cc8
6 files changed, 12 insertions, 0 deletions
diff --git a/webkit/glue/resources/default_100_percent/mediaplayer_closedcaption.png b/webkit/glue/resources/default_100_percent/mediaplayer_closedcaption.png
new file mode 100644
index 0000000..c2247aa
--- /dev/null
+++ b/webkit/glue/resources/default_100_percent/mediaplayer_closedcaption.png
Binary files differ
diff --git a/webkit/glue/resources/default_100_percent/mediaplayer_closedcaption_disabled.png b/webkit/glue/resources/default_100_percent/mediaplayer_closedcaption_disabled.png
new file mode 100644
index 0000000..0282d2a
--- /dev/null
+++ b/webkit/glue/resources/default_100_percent/mediaplayer_closedcaption_disabled.png
Binary files differ
diff --git a/webkit/glue/resources/default_100_percent/mediaplayer_closedcaption_down.png b/webkit/glue/resources/default_100_percent/mediaplayer_closedcaption_down.png
new file mode 100644
index 0000000..5a2752d
--- /dev/null
+++ b/webkit/glue/resources/default_100_percent/mediaplayer_closedcaption_down.png
Binary files differ
diff --git a/webkit/glue/resources/default_100_percent/mediaplayer_closedcaption_hover.png b/webkit/glue/resources/default_100_percent/mediaplayer_closedcaption_hover.png
new file mode 100644
index 0000000..11b5b69
--- /dev/null
+++ b/webkit/glue/resources/default_100_percent/mediaplayer_closedcaption_hover.png
Binary files differ
diff --git a/webkit/glue/resources/webkit_resources.grd b/webkit/glue/resources/webkit_resources.grd
index c13084b..9d26655 100644
--- a/webkit/glue/resources/webkit_resources.grd
+++ b/webkit/glue/resources/webkit_resources.grd
@@ -76,6 +76,10 @@
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER" file="mediaplayer_volume_slider_thumb_hover.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN" file="mediaplayer_volume_slider_thumb_down.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED" file="mediaplayer_volume_slider_thumb_disabled.png" />
+ <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON" file="mediaplayer_closedcaption.png" />
+ <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER" file="mediaplayer_closedcaption_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN" file="mediaplayer_closedcaption_down.png" />
+ <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED" file="mediaplayer_closedcaption_disabled.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_FULLSCREEN_BUTTON" file="mediaplayer_fullscreen.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER" file="mediaplayer_fullscreen_hover.png" />
<structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN" file="mediaplayer_fullscreen_down.png" />
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc
index 07b9e96..8cc850a 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/glue/webkitplatformsupport_impl.cc
@@ -458,6 +458,14 @@ const DataResource kDataResources[] = {
IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
{ "mediaplayerVolumeSliderThumbDisabled",
IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, ui::SCALE_FACTOR_100P },
+ { "mediaplayerClosedCaption",
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON, ui::SCALE_FACTOR_100P },
+ { "mediaplayerClosedCaption",
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+ { "mediaplayerClosedCaption",
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ { "mediaplayerClosedCaption",
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
{ "mediaplayerFullscreen",
IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P },
{ "mediaplayerFullscreenHover",