Merge 199387 "Add window buttons (close and maximize) to the Fil..."

chrome/browser/resources/file_manager/js/file_tasks.js

Index: chrome/browser/resources/file_manager/js/file_tasks.js
===================================================================
--- chrome/browser/resources/file_manager/js/file_tasks.js	(revision 199674)
+++ chrome/browser/resources/file_manager/js/file_tasks.js	(working copy)
@@ -513,7 +513,7 @@
   // changes in the Gallery and popped when the Gallery is closed.
   util.updateAppState(false /*push*/);
 
-  var onClose = function(selectedUrls) {
+  var onBack = function(selectedUrls) {
     fm.directoryModel_.selectUrls(selectedUrls);
     if (util.platform.v2()) {
       fm.closeFilePopup_();  // Will call Gallery.unload.
@@ -525,6 +525,14 @@
     }
   };
 
+  var onClose = function() {
+    fm.onClose();
+  };
+
+  var onMaximize = function() {
+    fm.onMaximize();
+  };
+
   galleryFrame.onload = function() {
     fm.show_();
     galleryFrame.contentWindow.ImageUtil.metrics = metrics;
@@ -551,7 +559,9 @@
       searchResults: fm.directoryModel_.isSearching(),
       metadataCache: fm.metadataCache_,
       pageState: this.params_,
+      onBack: onBack,
       onClose: onClose,
+      onMaximize: onMaximize,
       onThumbnailError: function(imageURL) {
         fm.metadataCache_.refreshFileMetadata(imageURL);
       },