From 799700750873825bf3ea234b48de0e130de9fa8c Mon Sep 17 00:00:00 2001
From: "qinmin@chromium.org"
 <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 24 Feb 2012 21:55:00 +0000
Subject: Add media fullscreen button resource for android

On android, we will use a fullscreen button instead of the mute/volume button
This is part of the upstreaming effort for chrome on android

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/9464023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123558 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/glue/resources/media_fullscreen.png | Bin 0 -> 2125 bytes
 webkit/glue/webkit_resources.grd           |   3 +++
 webkit/glue/webkitplatformsupport_impl.cc  |   3 +++
 3 files changed, 6 insertions(+)
 create mode 100644 webkit/glue/resources/media_fullscreen.png

diff --git a/webkit/glue/resources/media_fullscreen.png b/webkit/glue/resources/media_fullscreen.png
new file mode 100644
index 0000000..1c60e15
Binary files /dev/null and b/webkit/glue/resources/media_fullscreen.png differ
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index 4a19b36..37969b1 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -18,6 +18,9 @@
       <include name="IDR_INPUT_SPEECH" file="resources\input_speech.png" type="BINDATA" />
       <include name="IDR_INPUT_SPEECH_RECORDING" file="resources\input_speech_recording.png" type="BINDATA" />
       <include name="IDR_INPUT_SPEECH_WAITING" file="resources\input_speech_waiting.png" type="BINDATA" />
+      <if expr="pp_ifdef('android')">
+        <include name="IDR_MEDIA_FULLSCREEN_BUTTON" file="resources\media_fullscreen.png" type="BINDATA" />
+      </if>
       <include name="IDR_MEDIA_PAUSE_BUTTON" file="resources\media_pause.png" type="BINDATA" />
       <include name="IDR_MEDIA_PLAY_BUTTON" file="resources\media_play.png" type="BINDATA" />
       <include name="IDR_MEDIA_PLAY_BUTTON_DISABLED" file="resources\media_play_disabled.png" type="BINDATA" />
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc
index f2c109d..16358ff 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/glue/webkitplatformsupport_impl.cc
@@ -373,6 +373,9 @@ struct DataResource {
 
 const DataResource kDataResources[] = {
   { "missingImage", IDR_BROKENIMAGE },
+#if defined(OS_ANDROID)
+  { "mediaFullscreen", IDR_MEDIA_FULLSCREEN_BUTTON },
+#endif
   { "mediaPause", IDR_MEDIA_PAUSE_BUTTON },
   { "mediaPlay", IDR_MEDIA_PLAY_BUTTON },
   { "mediaPlayDisabled", IDR_MEDIA_PLAY_BUTTON_DISABLED },
-- 
cgit v1.1