[File Manager] Retain current image focus when exiting Gallery

chrome/browser/resources/file_manager/js/file_manager.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.
 
 /**
  * FileManager constructor.
  *
  * FileManager objects encapsulate the functionality of the file selector
  * dialogs, as well as the full screen file manager application (though the
  * latter is not yet implemented).
@@ skipping 1411 matching lines @@
         });
 
         return;
     }
   };
 
   /**
    * Respond to the back and forward buttons.
    */
   FileManager.prototype.onPopState_ = function(event) {
-    // TODO(serya): We should restore selected items here.
     this.closeFilePopup_();
+    // Nothing left to do if the current directory is not changing. This happens
+    // if we are exiting the Gallery.
+    if (this.getPathFromUrlOrParams_() ==
+        this.directoryModel_.currentEntry.fullPath)
+      return;
     this.setupCurrentDirectory_(true /* invokeHandler */);
   };
 
   FileManager.prototype.requestResize_ = function(timeout) {
     setTimeout(this.onResize_.bind(this), timeout || 0);
   };
 
   /**
    * Resize details and thumb views to fit the new window size.
    */
@@ skipping 1366 matching lines @@
   };
 
   FileManager.prototype.openGallery_ = function(urls) {
     var self = this;
 
     var galleryFrame = this.document_.createElement('iframe');
     galleryFrame.className = 'overlay-pane';
     galleryFrame.scrolling = 'no';
     galleryFrame.setAttribute('webkitallowfullscreen', true);
 
+    var singleSelection = urls.length == 1;
     var selectedUrl;
-    if (urls.length == 1 && FileType.isImage(urls[0])) {
+    if (singleSelection && FileType.isImage(urls[0])) {
       // Single image item selected. Pass to the Gallery as a selected.
       selectedUrl = urls[0];
       // Pass along every image and video in the directory so that it shows up
       // in the ribbon.
       // We do not do that if a single video is selected because the UI is
       // cleaner without the ribbon.
       urls = this.getAllUrlsInCurrentDirectory_().filter(
           FileType.isImageOrVideo);
     } else {
       // Pass just the selected items, select the first entry.
@@ skipping 10 matching lines @@
       galleryFrame.contentWindow.ImageUtil.metrics = metrics;
       galleryFrame.contentWindow.FileType = FileType;
       galleryFrame.contentWindow.util = util;
 
       // Gallery shoud treat GData folder as readonly even when online
       // until we learn to save files directly to GData.
       var readonly = self.isOnReadonlyDirectory() || self.isOnGData();
       var currentDir = self.directoryModel_.currentEntry;
       var downloadsDir = self.directoryModel_.rootsList.item(0);
 
+      var gallerySelection;

[dgozman, 2012/04/23 16:22:17]

Another approach is to introduce parameter |selectedItem| to onClose callback.
 

[Vladislav Kaznacheev, 2012/04/24 08:13:53]

I thought about that but it requires at least as much extra code and the
encapsulation benefits are not that clear.
On 2012/04/23 16:22:17, dgozman wrote:

       var context = {
         // We show the root label in readonly warning (e.g. archive name).
         readonlyDirName:
             readonly ?
                 (self.isOnGData() ?
                     self.getRootLabel_(currentDir.fullPath) :
                     self.directoryModel_.rootName) :
                 null,
         saveDirEntry: readonly ? downloadsDir : currentDir,
         metadataProvider: self.getMetadataProvider(),
         getShareActions: self.getShareActions_.bind(self),
         onNameChange: function(name) {
-          self.document_.title = name;
+          self.document_.title = gallerySelection = name;
           self.updateLocation_(true /*replace*/, dirPath + '/' + name);
         },
         onClose: function() {
+          if (singleSelection)
+            self.directoryModel_.selectEntry(gallerySelection);
           history.back(1);
         },
         displayStringFunction: strf
       };
       galleryFrame.contentWindow.Gallery.open(context, urls, selectedUrl);
     };
 
     galleryFrame.src = 'gallery.html';
     this.openFilePopup_(galleryFrame);
   };
@@ skipping 1445 matching lines @@
 
       handleSplitterDragEnd: function(e) {
         Splitter.prototype.handleSplitterDragEnd.apply(this, arguments);
         this.ownerDocument.documentElement.classList.remove('col-resize');
       }
     };
 
     customSplitter.decorate(splitterElement);
   };
 })();