Migrate fullPaths to URLs in appState.

chrome/browser/resources/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 557 matching lines @@
    * initializing methods.
    *
    * @param {function()} callback Completion callback.
    * @private
    */
   FileManager.prototype.initGeneral_ = function(callback) {
     // Initialize the application state.
     // TODO(mtomasz): Unify window.appState with location.search format.
     if (window.appState) {
       this.params_ = window.appState.params || {};
-      this.initCurrentDirectoryPath_ = window.appState.currentDirectoryPath;
-      this.initSelectionPath_ = window.appState.selectionPath;
+      this.initCurrentDirectoryURL_ = window.appState.currentDirectoryURL;
+      this.initSelectionPath_ = window.appState.selectionURL;
       this.initTargetName_ = window.appState.targetName;
     } else {
       // Used by the select dialog only.
       this.params_ = location.search ?
                      JSON.parse(decodeURIComponent(location.search.substr(1))) :
                      {};
-      this.initCurrentDirectoryPath_ = this.params_.currentDirectoryPath;
-      this.initSelectionPath_ = this.params_.selectionPath;
+      this.initCurrentDirectoryURL_ = this.params_.currentDirectoryURL;
+      this.initSelectionURL_ = this.params_.selectionURL;
       this.initTargetName_ = this.params_.targetName;
     }
 
     // Initialize the member variables that depend this.params_.
     this.dialogType = this.params_.type || DialogType.FULL_PAGE;
     this.startupPrefName_ = 'file-manager-' + this.dialogType;
     this.fileTypes_ = this.params_.typeList || [];
 
     callback();
   };
@@ skipping 796 matching lines @@
 
     // Wait until the volume manager is initialized.
     queue.run(function(callback) {
       tracker.start();
       this.volumeManager_.ensureInitialized(callback);
     }.bind(this));
 
     var nextCurrentDirEntry;
     var selectionEntry;
 
-    // Resolve the selectionPath to selectionEntry or to currentDirectoryEntry
+    // Resolve the selectionURL to selectionEntry or to currentDirectoryEntry
     // in case of being a display root.
     queue.run(function(callback) {
-      // TODO(mtomasz): Migrate to URLs, and stop calling resolveAbsolutePath.
-      if (!this.initSelectionPath_) {
+      // TODO(mtomasz): Migrate to URLs, and stop calling resolveAbsoluteURL.
+      if (!this.initSelectionURL_) {
         callback();
         return;
       }
-      this.volumeManager_.resolveAbsolutePath(
-          this.initSelectionPath_,
+      this.volumeManager_.resolveAbsoluteURL(
+          this.initSelectionURL_,
           function(inEntry) {
             var locationInfo = this.volumeManager_.getLocationInfo(inEntry);
             // If the selection is root, then use it as a current directory
             // instead. This is because, selecting a root entry is done as
             // opening it.
             if (locationInfo && locationInfo.isRootEntry)
               nextCurrentDirEntry = inEntry;
             else
               selectionEntry = inEntry;
             callback();
           }.bind(this), callback);
     }.bind(this));
-    // Resolve the currentDirectoryPath to currentDirectoryEntry (if not done
+    // Resolve the currentDirectoryURL to currentDirectoryEntry (if not done
     // by the previous step).
     queue.run(function(callback) {
-      if (nextCurrentDirEntry || !this.initCurrentDirectoryPath_) {
+      if (nextCurrentDirEntry || !this.initCurrentDirectoryURL_) {
         callback();
         return;
       }
-      // TODO(mtomasz): Migrate to URLs, and stop calling resolveAbsolutePath.
-      this.volumeManager_.resolveAbsolutePath(
-          this.initCurrentDirectoryPath_,
+      webkitResolveLocalFileSystemURL(
+          this.initCurrentDirectoryURL_,
           function(inEntry) {
             nextCurrentDirEntry = inEntry;
             callback();
           }, callback);
       // TODO(mtomasz): Implement reopening on special search, when fake
       // entries are converted to directory providers.
     }.bind(this));
 
     // If the directory to be changed to is not available, then first fallback
     // to the parent of the selection entry.
@@ skipping 82 matching lines @@
     if (util.isFakeEntry(directoryEntry)) {
       this.directoryModel_.specialSearch(directoryEntry, '');
     } else {
       this.directoryModel_.changeDirectoryEntry(directoryEntry, function() {
         if (opt_selectionEntry)
           this.directoryModel_.selectEntry(opt_selectionEntry);
       }.bind(this));
     }
 
     if (this.dialogType === DialogType.FULL_PAGE) {
-      // In the FULL_PAGE mode if the restored path points to a file we might
+      // In the FULL_PAGE mode if the restored URL points to a file we might
       // have to invoke a task after selecting it.
       if (this.params_.action === 'select')
         return;
 
       var task = null;
       // Handle restoring after crash, or the gallery action.
       // TODO(mtomasz): Use the gallery action instead of just the gallery
       //     field.
       if (this.params_.gallery || this.params_.action === 'gallery') {
         if (!opt_selectionEntry) {
@@ skipping 12 matching lines @@
       } else {
         // TODO(mtomasz): Implement remounting archives after crash.
         //                See: crbug.com/333139
       }
 
       // If there is a task to be run, run it after the scan is completed.
       if (task) {
         var listener = function() {
           if (!util.isSameEntry(this.directoryModel_.getCurrentDirEntry(),
                                directoryEntry)) {
-            // Opened on a different path. Probably fallbacked. Therefore,
+            // Opened on a different URL. Probably fallbacked. Therefore,
             // do not invoke a task.
             return;
           }
           this.directoryModel_.removeEventListener(
               'scan-completed', listener);
           task();
         }.bind(this);
         this.directoryModel_.addEventListener('scan-completed', listener);
       }
     } else if (this.dialogType === DialogType.SELECT_SAVEAS_FILE) {
@@ skipping 632 matching lines @@
 
   /**
    * Update the UI when the current directory changes.
    *
    * @param {Event} event The directory-changed event.
    * @private
    */
   FileManager.prototype.onDirectoryChanged_ = function(event) {
     this.selectionHandler_.onFileSelectionChanged();
     this.ui_.searchBox.clear();
-    // TODO(mtomasz): Use Entry.toURL() instead of fullPath.
     // TODO(mtomasz): Consider remembering the selection.
     util.updateAppState(
         this.getCurrentDirectoryEntry() ?
-        this.getCurrentDirectoryEntry().fullPath : '',
-        '' /* selectionPath */,
+        this.getCurrentDirectoryEntry().toURL() : '',
+        '' /* selectionURL */,
         '' /* opt_param */);
 
     // If the current directory is moved from the device's volume, do not
     // automatically close the window on device removal.
     if (event.previousDirEntry &&
         PathUtil.getRootPath(event.previousDirEntry.fullPath) !=
             PathUtil.getRootPath(event.newDirEntry.fullPath))
       this.closeOnUnmount_ = false;
 
     if (this.commandHandler)
@@ skipping 1378 matching lines @@
       callback(this.preferences_);
       return;
     }
 
     chrome.fileBrowserPrivate.getPreferences(function(prefs) {
       this.preferences_ = prefs;
       callback(prefs);
     }.bind(this));
   };
 })();