Better fullscreen handling for Chrome OS Video Player

chrome/browser/resources/file_manager/js/image_editor/gallery.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /*
  * Base class that Ribbon uses to display photos.
  */
 
 function RibbonClient() {}
 
@@ skipping 209 matching lines @@
   this.editor_.trackWindow(doc.defaultView);
 
   if (shareActions.length > 0) {
     this.shareMode_ = new ShareMode(
         this.editor_, this.container_, this.toolbar_, shareActions,
         this.onShare_.bind(this), this.onActionExecute_.bind(this),
         this.displayStringFunction_);
   } else {
     this.shareMode_ = null;
   }
+
+  Gallery.getFileBrowserPrivate().isFullscreen(function(fullscreen) {
+    this.originalFullscreen_ = fullscreen;
+  }.bind(this));
 };
 
 Gallery.blobToURL_ = function(blob) {
   // Append a file name after an anchor so that the Gallery
   // code can find the file extension at the end of the url.
   // A File instance contains the real file name in the 'name' property.
   // For a Blob instance we make up a fake file name out of the mime type
   // (image/jpeg -> image.jpg).
   return window.webkitURL.createObjectURL(blob) +
       '#' + (blob.name || (blob.type.replace('/', '.')));
@@ skipping 188 matching lines @@
   }
 
   dir.getFile(newName, {create: false, exclusive: false},
       onVictimFound, doRename);
 };
 
 Gallery.prototype.isRenaming_ = function() {
   return this.container_.hasAttribute('renaming');
 };
 
-Gallery.prototype.toggleFullscreen_ = function() {
-  if (this.document_.webkitIsFullScreen) {
-    this.document_.webkitCancelFullScreen();
-  } else {
-    this.document_.body.webkitRequestFullScreen();
-  }
+Gallery.getFileBrowserPrivate = function() {
+  return chrome.fileBrowserPrivate || window.top.chrome.fileBrowserPrivate;
 };
 
+Gallery.prototype.toggleFullscreen_ = function() {
+  Gallery.getFileBrowserPrivate().toggleFullscreen();
+};
+
+/**
+ * Close the Gallery.
+ */
+Gallery.prototype.close_ = function() {
+  Gallery.getFileBrowserPrivate().isFullscreen(function(fullscreen) {
+    if (this.originalFullscreen_ != fullscreen) {
+      Gallery.getFileBrowserPrivate().toggleFullscreen();
+    }
+    this.closeCallback_();
+  }.bind(this));
+};
+
+/**
+ * Handle user's 'Close' action (Escape or a click on the X icon).
+ */
 Gallery.prototype.onClose_ = function() {
-  if (this.document_.webkitIsFullScreen) {
-    // Closing the Gallery iframe while in full screen will crash the tab.
-    this.document_.addEventListener(
-        'webkitfullscreenchange', this.onClose_.bind(this));
-    this.document_.webkitCancelFullScreen();
-    return;
-  }
   // TODO: handle write errors gracefully (suggest retry or saving elsewhere).
-  this.saveChanges_(this.closeCallback_);
+  this.saveChanges_(this.close_.bind(this));
 };
 
 Gallery.prototype.prefetchImage = function(id, content, metadata) {
   this.editor_.prefetchImage(id, content, metadata);
 };
 
 Gallery.prototype.openImage = function(id, content, metadata, slide, callback) {
   // The first change is load, we should not count it.
   this.imageChanges_ = -1;
 
@@ skipping 791 matching lines @@
 ShareMode.prototype.setUp = function() {
   ImageEditor.Mode.prototype.setUp.apply(this, arguments);
   ImageUtil.setAttribute(this.menu_, 'hidden', false);
   ImageUtil.setAttribute(this.button_, 'pressed', false);
 };
 
 ShareMode.prototype.cleanUpUI = function() {
   ImageEditor.Mode.prototype.cleanUpUI.apply(this, arguments);
   ImageUtil.setAttribute(this.menu_, 'hidden', true);
 };