Index: ui/file_manager/video_player/js/video_player.js |
diff --git a/ui/file_manager/video_player/js/video_player.js b/ui/file_manager/video_player/js/video_player.js |
index eaa6f31cb3e336c0b298c0e1c6841a88d93b807b..6420f6c013e25df67aa5553a053c47bfdd22f7b1 100644 |
--- a/ui/file_manager/video_player/js/video_player.js |
+++ b/ui/file_manager/video_player/js/video_player.js |
@@ -15,7 +15,6 @@ function FullWindowVideoControls( |
VideoControls.call(this, |
controlsContainer, |
this.onPlaybackError_.wrap(this), |
- loadTimeData.getString.wrap(loadTimeData), |
this.toggleFullScreen_.wrap(this), |
videoContainer); |
@@ -28,9 +27,9 @@ function FullWindowVideoControls( |
window.addEventListener('resize', this.updateStyle.wrap(this)); |
var currentWindow = chrome.app.window.current(); |
currentWindow.onFullscreened.addListener( |
- this.onFullScreenChanged_.bind(this, true)); |
+ this.onFullScreenChanged.bind(this, true)); |
currentWindow.onRestored.addListener( |
- this.onFullScreenChanged_.bind(this, false)); |
+ this.onFullScreenChanged.bind(this, false)); |
document.addEventListener('keydown', function(e) { |
switch (util.getKeyModifiers(e) + e.keyIdentifier) { |
// Handle debug shortcut keys. |
@@ -49,7 +48,8 @@ function FullWindowVideoControls( |
case 'U+0020': // Space |
case 'MediaPlayPause': |
- this.togglePlayStateWithFeedback(); |
+ if (!e.target.classList.contains('menu-button')) |
+ this.togglePlayStateWithFeedback(); |
break; |
case 'U+001B': // Escape |
util.toggleFullScreen( |
@@ -120,7 +120,7 @@ FullWindowVideoControls.prototype.getInactivityWatcher = function() { |
*/ |
FullWindowVideoControls.prototype.showErrorMessage = function(message) { |
var errorBanner = getRequiredElement('error'); |
- errorBanner.textContent = loadTimeData.getString(message); |
+ errorBanner.textContent = str(message); |
errorBanner.setAttribute('visible', 'true'); |
// The window is hidden if the video has not loaded yet. |
@@ -168,19 +168,6 @@ FullWindowVideoControls.prototype.toggleFullScreen_ = function() { |
}; |
/** |
- * Updates video control when the window is fullscreened or restored. |
- * @param {boolean} fullscreen True if the window gets fullscreened. |
- * @private |
- */ |
-FullWindowVideoControls.prototype.onFullScreenChanged_ = function(fullscreen) { |
- if (fullscreen) { |
- this.playerContainer_.setAttribute('fullscreen', ''); |
- } else { |
- this.playerContainer_.removeAttribute('fullscreen'); |
- } |
-}; |
- |
-/** |
* Media completion handler. |
*/ |
FullWindowVideoControls.prototype.onMediaComplete = function() { |
@@ -581,7 +568,7 @@ VideoPlayer.prototype.setCastList = function(casts) { |
} |
var item = new cr.ui.MenuItem(); |
- item.label = loadTimeData.getString('VIDEO_PLAYER_PLAY_THIS_COMPUTER'); |
+ item.label = str('VIDEO_PLAYER_PLAY_THIS_COMPUTER'); |
item.setAttribute('aria-label', item.label); |
item.castLabel = ''; |
item.addEventListener('activate', this.onCastSelected_.wrap(this, null)); |