Files.app: Remove getDriveFiles function from the private API.

ui/file_manager/file_manager/foreground/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.
 
 'use strict';
 
 /**
  * FileManager constructor.
  *
  * FileManager objects encapsulate the functionality of the file selector
@@ skipping 3465 matching lines @@
    *
    * @param {Event} event The click event.
    * @private
    */
   FileManager.prototype.onCancel_ = function(event) {
     chrome.fileManagerPrivate.cancelDialog();
     window.close();
   };
 
   /**
-   * Resolves selected file urls returned from an Open dialog.
-   *
-   * For drive files this involves some special treatment.
-   * Starts getting drive files if needed.
-   *
-   * @param {Array.<string>} fileUrls Drive URLs.
-   * @param {function(Array.<string>)} callback To be called with fixed URLs.
-   * @private
-   */
-  FileManager.prototype.resolveSelectResults_ = function(fileUrls, callback) {
-    if (this.isOnDrive()) {
-      chrome.fileManagerPrivate.getDriveFiles(
-        fileUrls,
-        function(localPaths) {
-          callback(fileUrls);
-        });
-    } else {
-      callback(fileUrls);
-    }
-  };
-
-  /**
-   * Closes this modal dialog with some files selected.
-   * TODO(jamescook): Make unload handler work automatically, crbug.com/104811
-   * @param {Object} selection Contains urls, filterIndex and multiple fields.
-   * @private
-   */
-  FileManager.prototype.callSelectFilesApiAndClose_ = function(selection) {
-    var self = this;
-    function callback() {
-      window.close();
-    }
-    if (selection.multiple) {
-      chrome.fileManagerPrivate.selectFiles(
-          selection.urls, this.params_.shouldReturnLocalPath, callback);
-    } else {
-      var forOpening = (this.dialogType != DialogType.SELECT_SAVEAS_FILE);
-      chrome.fileManagerPrivate.selectFile(
-          selection.urls[0], selection.filterIndex, forOpening,
-          this.params_.shouldReturnLocalPath, callback);
-    }
-  };
-
-  /**
    * Tries to close this modal dialog with some files selected.
    * Performs preprocessing if needed (e.g. for Drive).
    * @param {Object} selection Contains urls, filterIndex and multiple fields.
    * @private
    */
   FileManager.prototype.selectFilesAndClose_ = function(selection) {
-    if (!this.isOnDrive() ||
-        this.dialogType == DialogType.SELECT_SAVEAS_FILE) {
-      setTimeout(this.callSelectFilesApiAndClose_.bind(this, selection), 0);
+    var callSelectFilesApiAndClose = function(callback) {
+      var onFileSelected = function() {
+        callback();
+        if (!chrome.runtime.lastError) {
+          // Call next method on a timeout, as it's unsafe to
+          // close a window from a callback.
+          setTimeout(window.close.bind(window), 0);
+        }
+      };
+      if (selection.multiple) {
+        chrome.fileManagerPrivate.selectFiles(
+            selection.urls,
+            this.params_.shouldReturnLocalPath,
+            onFileSelected);
+      } else {
+        chrome.fileManagerPrivate.selectFile(
+            selection.urls[0],
+            selection.filterIndex,
+            this.dialogType != DialogType.SELECT_SAVEAS_FILE /* for opening */,
+            this.params_.shouldReturnLocalPath,
+            onFileSelected);
+      }
+    }.bind(this);
+
+    if (!this.isOnDrive() || this.dialogType == DialogType.SELECT_SAVEAS_FILE) {
+      callSelectFilesApiAndClose(function() {});
       return;
     }
 
     var shade = this.document_.createElement('div');
     shade.className = 'shade';
     var footer = this.dialogDom_.querySelector('.button-panel');
     var progress = footer.querySelector('.progress-track');
     progress.style.width = '0%';
     var cancelled = false;
 
     var progressMap = {};
     var filesStarted = 0;
     var filesTotal = selection.urls.length;
     for (var index = 0; index < selection.urls.length; index++) {
       progressMap[selection.urls[index]] = -1;
     }
     var lastPercent = 0;
     var bytesTotal = 0;
     var bytesDone = 0;
 
     var onFileTransfersUpdated = function(status) {
-      var escaped = encodeURI(status.fileUrl);
-      var old = progressMap[escaped];
+      if (!(status.fileUrl in progressMap))
+        return;
+      if (status.total == -1)
+        return;
+
+      var old = progressMap[status.fileUrl];
       if (old == -1) {
         // -1 means we don't know file size yet.
         bytesTotal += status.total;
         filesStarted++;
         old = 0;
       }
       bytesDone += status.processed - old;
-      progressMap[escaped] = status.processed;
+      progressMap[status.fileUrl] = status.processed;
 
       var percent = bytesTotal == 0 ? 0 : bytesDone / bytesTotal;
       // For files we don't have information about, assume the progress is zero.
       percent = percent * filesStarted / filesTotal * 100;
       // Do not decrease the progress. This may happen, if first downloaded
       // file is small, and the second one is large.
       lastPercent = Math.max(lastPercent, percent);
       progress.style.width = lastPercent + '%';
     }.bind(this);
 
     var setup = function() {
       this.document_.querySelector('.dialog-container').appendChild(shade);
-      setTimeout(function() { shade.setAttribute('fadein', 'fadein') }, 100);
+      setTimeout(function() { shade.setAttribute('fadein', 'fadein'); }, 100);
       footer.setAttribute('progress', 'progress');
       this.cancelButton_.removeEventListener('click', this.onCancelBound_);
       this.cancelButton_.addEventListener('click', onCancel);
       chrome.fileManagerPrivate.onFileTransfersUpdated.addListener(
           onFileTransfersUpdated);
     }.bind(this);
 
     var cleanup = function() {
       shade.parentNode.removeChild(shade);
       footer.removeAttribute('progress');
       this.cancelButton_.removeEventListener('click', onCancel);
       this.cancelButton_.addEventListener('click', this.onCancelBound_);
       chrome.fileManagerPrivate.onFileTransfersUpdated.removeListener(
           onFileTransfersUpdated);
     }.bind(this);
 
     var onCancel = function() {
-      cancelled = true;
       // According to API cancel may fail, but there is no proper UI to reflect
       // this. So, we just silently assume that everything is cancelled.
       chrome.fileManagerPrivate.cancelFileTransfers(
           selection.urls, function(response) {});
-      cleanup();
-    }.bind(this);
-
-    var onResolved = function(resolvedUrls) {
-      if (cancelled) return;
-      cleanup();
-      selection.urls = resolvedUrls;
-      // Call next method on a timeout, as it's unsafe to
-      // close a window from a callback.
-      setTimeout(this.callSelectFilesApiAndClose_.bind(this, selection), 0);
     }.bind(this);
 
     var onProperties = function(properties) {
       for (var i = 0; i < properties.length; i++) {
         if (!properties[i] || properties[i].present) {
           // For files already in GCache, we don't get any transfer updates.
           filesTotal--;
         }
       }
-      this.resolveSelectResults_(selection.urls, onResolved);
+      callSelectFilesApiAndClose(cleanup);
     }.bind(this);
 
     setup();
 
     // TODO(mtomasz): Use Entry instead of URLs, if possible.
     util.URLsToEntries(selection.urls, function(entries) {
       this.metadataCache_.get(entries, 'external', onProperties);
     }.bind(this));
   };
 
@@ skipping 509 matching lines @@
       callback(this.preferences_);
       return;
     }
 
     chrome.fileManagerPrivate.getPreferences(function(prefs) {
       this.preferences_ = prefs;
       callback(prefs);
     }.bind(this));
   };
 })();