diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-17 22:28:47 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-17 22:28:47 +0000 |
| commit | 4f25a0c58ac37f58db6800ff024d462e795f864f (patch) | |
| tree | b56b9b061117fbad80b4f79c6414bee41377d26a /webkit | |
| parent | 9c05a45debfdc61b6df410d63b431eb402cb9b32 (diff) | |
| download | chromium_src-4f25a0c58ac37f58db6800ff024d462e795f864f.zip chromium_src-4f25a0c58ac37f58db6800ff024d462e795f864f.tar.gz chromium_src-4f25a0c58ac37f58db6800ff024d462e795f864f.tar.bz2 | |
remove video fullscreen button resources for android as desktop chromium also introduced it
Recent media control change has introduced fullscreen button for desktop chromium.
We no longer need the same resource for android.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10787029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/resources/media_fullscreen.png | bin | 2125 -> 0 bytes | |||
| -rw-r--r-- | webkit/glue/webkit_resources.grd | 3 | ||||
| -rw-r--r-- | webkit/glue/webkitplatformsupport_impl.cc | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/webkit/glue/resources/media_fullscreen.png b/webkit/glue/resources/media_fullscreen.png Binary files differdeleted file mode 100644 index 1c60e15..0000000 --- a/webkit/glue/resources/media_fullscreen.png +++ /dev/null diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd index 002bdba..149b116 100644 --- a/webkit/glue/webkit_resources.grd +++ b/webkit/glue/webkit_resources.grd @@ -18,9 +18,6 @@ <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 34043e3..ac52a26 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/glue/webkitplatformsupport_impl.cc @@ -390,9 +390,6 @@ struct DataResource { const DataResource kDataResources[] = { { "missingImage", IDR_BROKENIMAGE, ui::SCALE_FACTOR_100P }, { "missingImage@2x", IDR_BROKENIMAGE, ui::SCALE_FACTOR_200P }, -#if defined(OS_ANDROID) - { "mediaFullscreen", IDR_MEDIA_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P }, -#endif { "mediaPause", IDR_MEDIA_PAUSE_BUTTON, ui::SCALE_FACTOR_100P }, { "mediaPlay", IDR_MEDIA_PLAY_BUTTON, ui::SCALE_FACTOR_100P }, { "mediaPlayDisabled", |
