diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-27 20:43:33 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-27 20:43:33 +0000 |
| commit | baa21bf8380e83d72beef267087a88002c195412 (patch) | |
| tree | 606d25bcc070f4ee17bd79186e05778a5e857fb9 /webkit | |
| parent | d163f2595f3ce8d17827ffd2b4e0dc820494c6c2 (diff) | |
| download | chromium_src-baa21bf8380e83d72beef267087a88002c195412.zip chromium_src-baa21bf8380e83d72beef267087a88002c195412.tar.gz chromium_src-baa21bf8380e83d72beef267087a88002c195412.tar.bz2 | |
adding overlay play button resource for media control on android
WebKit change: https://bugs.webkit.org/show_bug.cgi?id=92132
BUG=
Review URL: https://chromiumcodereview.appspot.com/10830055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/resources/mediaplayer_overlay_play.png | bin | 0 -> 2262 bytes | |||
| -rw-r--r-- | webkit/glue/webkit_resources.grd | 3 | ||||
| -rw-r--r-- | webkit/glue/webkitplatformsupport_impl.cc | 4 |
3 files changed, 7 insertions, 0 deletions
diff --git a/webkit/glue/resources/mediaplayer_overlay_play.png b/webkit/glue/resources/mediaplayer_overlay_play.png Binary files differnew file mode 100644 index 0000000..db43710 --- /dev/null +++ b/webkit/glue/resources/mediaplayer_overlay_play.png diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd index 1eb4d7f..8772e4d 100644 --- a/webkit/glue/webkit_resources.grd +++ b/webkit/glue/webkit_resources.grd @@ -54,6 +54,9 @@ <include name="IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER" file="resources\mediaplayer_fullscreen_hover.png" type="BINDATA" /> <include name="IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN" file="resources\mediaplayer_fullscreen_down.png" type="BINDATA" /> <include name="IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED" file="resources\mediaplayer_fullscreen_disabled.png" type="BINDATA" /> + <if expr="pp_ifdef('android')"> + <include name="IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON" file="resources\mediaplayer_overlay_play.png" type="BINDATA" /> + </if> <if expr="is_macosx"> <include name="IDR_OVERHANG_PATTERN" file="resources\overhang_pattern.png" type="BINDATA" /> </if> diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc index e515208..c1ef182 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/glue/webkitplatformsupport_impl.cc @@ -460,6 +460,10 @@ const DataResource kDataResources[] = { IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, { "mediaplayerFullscreenDisabled", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, +#if defined(OS_ANDROID) + { "mediaplayerOverlayPlay", + IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P }, +#endif #if defined(OS_MACOSX) { "overhangPattern", IDR_OVERHANG_PATTERN, ui::SCALE_FACTOR_100P }, #endif |
