summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-29 15:37:47 +0000
committerkaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-29 15:37:47 +0000
commita1244e3b8598b13f05dcba9d87bd3f0448d5165c (patch)
treef48fae86227c0c657bdc7a463848d34b1b79e61e
parent1671162ffe4a1dd3b54de53732c6ae865b2f8ea3 (diff)
downloadchromium_src-a1244e3b8598b13f05dcba9d87bd3f0448d5165c.zip
chromium_src-a1244e3b8598b13f05dcba9d87bd3f0448d5165c.tar.gz
chromium_src-a1244e3b8598b13f05dcba9d87bd3f0448d5165c.tar.bz2
Added "Exit full screen" button to Chrome OS Media Player.
The new button is made out of the existing "full screen" button with simple copy/pastes so it needs professional polish. BUG=chromium-os:4913 TEST=Manual Review URL: http://codereview.chromium.org/6905126 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83515 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/mediaplayer.html16
-rw-r--r--chrome/browser/resources/shared/images/mediaplayer_full_screen_exit.pngbin0 -> 919 bytes
2 files changed, 16 insertions, 0 deletions
diff --git a/chrome/browser/resources/mediaplayer.html b/chrome/browser/resources/mediaplayer.html
index 4cbeb276..d3ef625 100644
--- a/chrome/browser/resources/mediaplayer.html
+++ b/chrome/browser/resources/mediaplayer.html
@@ -151,6 +151,12 @@ body {
background-position: 6px 8px;
}
+.fullscreenexiticon {
+ background: url('shared/images/mediaplayer_full_screen_exit.png');
+ background-repeat: no-repeat;
+ background-position: 6px 8px;
+}
+
.volumeslider {
-webkit-appearance: slider-vertical;
position: absolute;
@@ -596,6 +602,7 @@ function setupPlaybackControls() {
fullscreen.className = controlsclass + ' controlbutton fullscreen';
fullscreen.onclick = toggleFullscreen;
var fullscreenicon = document.createElement('div');
+ fullscreenicon.id = 'fullscreenicon';
fullscreenicon.className = 'icon fullscreenicon';
fullscreen.appendChild(fullscreenicon);
element.appendChild(fullscreen);
@@ -665,6 +672,15 @@ function onkeydown(event) {
function toggleFullscreen() {
fullScreen = !fullScreen;
+ var fullscreenicon = $('fullscreenicon');
+ if (fullScreen) {
+ fullscreenicon.classList.remove('fullscreenicon');
+ fullscreenicon.classList.add('fullscreenexiticon');
+ }
+ else {
+ fullscreenicon.classList.remove('fullscreenexiticon');
+ fullscreenicon.classList.add('fullscreenicon');
+ }
chrome.send('toggleFullscreen', ['']);
}
diff --git a/chrome/browser/resources/shared/images/mediaplayer_full_screen_exit.png b/chrome/browser/resources/shared/images/mediaplayer_full_screen_exit.png
new file mode 100644
index 0000000..a29f90a
--- /dev/null
+++ b/chrome/browser/resources/shared/images/mediaplayer_full_screen_exit.png
Binary files differ