Migrate from URLs to Entries in the Files App's gallery.

chrome/browser/resources/file_manager/foreground/js/file_tasks.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.
 
 'use strict';
 
 /**
  * This object encapsulates everything related to tasks execution.
  *
  * @param {FileManager} fileManager FileManager instance.
@@ skipping 548 matching lines @@
 
 /**
  * The core implementation of mounts archives.
  *
  * @param {Array.<Entry>} entries Mount file entries list.
  * @private
  */
 FileTasks.prototype.mountArchivesInternal_ = function(entries) {
   var fm = this.fileManager_;
 
-  var tracker = fm.directoryModel_.createDirectoryChangeTracker();
+  var tracker = fm.directoryModel.createDirectoryChangeTracker();
   tracker.start();
 
   // TODO(mtomasz): Pass Entries instead of URLs.
   var urls = util.entriesToURLs(entries);
   fm.resolveSelectResults_(urls, function(resolvedURLs) {
     for (var index = 0; index < resolvedURLs.length; ++index) {
       // TODO(mtomasz): Pass Entry instead of URL.
-      fm.volumeManager_.mountArchive(resolvedURLs[index],
+      fm.volumeManager.mountArchive(resolvedURLs[index],
         function(mountPath) {
           tracker.stop();
           if (!tracker.hasChanged)
-            fm.directoryModel_.changeDirectory(mountPath);
+            fm.directoryModel.changeDirectory(mountPath);
         }, function(url, error) {
           tracker.stop();
           var path = util.extractFilePath(url);
           var namePos = path.lastIndexOf('/');
           fm.alert.show(strf('ARCHIVE_MOUNT_FAILED',
                              path.substr(namePos + 1), error));
         }.bind(null, resolvedURLs[index]));
       }
   });
 };
@@ skipping 30 matching lines @@
     util.updateAppState(null /* keep path */, '' /* remove search. */);
   }
 
   var savedAppState = window.appState;
   var savedTitle = document.title;
 
   // Push a temporary state which will be replaced every time the selection
   // changes in the Gallery and popped when the Gallery is closed.
   util.updateAppState();
 
-  // TODO(mtomasz): Pass entries instead of urls.
-  var onBack = function(selectedUrls) {
-    fm.directoryModel_.selectUrls(selectedUrls);
+  var onBack = function(selectedEntries) {
+    fm.directoryModel.selectEntries(selectedEntries);
     fm.closeFilePopup();  // Will call Gallery.unload.
     window.appState = savedAppState;
     util.saveAppState();
     document.title = savedTitle;
   };
 
   var onClose = function() {
     fm.onClose();
   };
 
   var onMaximize = function() {
     fm.onMaximize();
   };
 
   var onAppRegionChanged = function(visible) {
     fm.onFilePopupAppRegionChanged(visible);
   };
 
   galleryFrame.onload = function() {
     galleryFrame.contentWindow.ImageUtil.metrics = metrics;
 
     // TODO(haruki): isOnReadonlyDirectory() only checks the permission for the
     // root. We should check more granular permission to know whether the file
     // is writable or not.
     var readonly = fm.isOnReadonlyDirectory();
     var currentDir = fm.getCurrentDirectoryEntry();
     var downloadsVolume =
-        fm.volumeManager_.getCurrentProfileVolumeInfo(RootType.DOWNLOADS);
+        fm.volumeManager.getCurrentProfileVolumeInfo(RootType.DOWNLOADS);
     var downloadsDir = downloadsVolume && downloadsVolume.root;
     var readonlyDirName = null;
     if (readonly && currentDir) {
       var rootPath = PathUtil.getRootPath(currentDir.fullPath);
       readonlyDirName = fm.isOnDrive() ?
           PathUtil.getRootLabel(rootPath) :
           PathUtil.basename(rootPath);
     }
 
     var context = {
       // We show the root label in readonly warning (e.g. archive name).
       readonlyDirName: readonlyDirName,
       curDirEntry: currentDir,
       saveDirEntry: readonly ? downloadsDir : null,
-      searchResults: fm.directoryModel_.isSearching(),
+      searchResults: fm.directoryModel.isSearching(),
       metadataCache: fm.metadataCache_,
       pageState: this.params_,
       appWindow: chrome.app.window.current(),
       onBack: onBack,
       onClose: onClose,
       onMaximize: onMaximize,
       onAppRegionChanged: onAppRegionChanged,
       displayStringFunction: strf
     };
-    // TODO(mtomasz): Pass entries instead.
-    var allUrls = util.entriesToURLs(allEntries);
-    var urls = util.entriesToURLs(entries);
     galleryFrame.contentWindow.Gallery.open(
-        context, fm.volumeManager_, allUrls, urls);
+        context, fm.volumeManager, allEntries, entries);
   }.bind(this);
 
   galleryFrame.src = 'gallery.html';
   fm.openFilePopup(galleryFrame, fm.updateTitle_.bind(fm));
 };
 
 /**
  * Displays the list of tasks in a task picker combobutton.
  *
  * @param {cr.ui.ComboButton} combobutton The task picker element.
@@ skipping 127 matching lines @@
       items, defaultIdx,
       function(item) {
         onSuccess(item.task);
       });
 };
 
 FileTasks.decorate('display');
 FileTasks.decorate('updateMenuItem');
 FileTasks.decorate('execute');
 FileTasks.decorate('executeDefault');