Remember current directory for each volume.

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 750 matching lines @@
   FileManager.prototype.initRootsList_ = function() {
     this.rootsList_ = this.dialogDom_.querySelector('.roots-list');
     cr.ui.List.decorate(this.rootsList_);
     this.rootsList_.startBatchUpdates();
 
     var self = this;
     this.rootsList_.itemConstructor = function(entry) {
       return self.renderRoot_(entry);
     };
 
-    this.rootsList_.selectionModel = this.directoryModel_.rootsListSelection;
+    this.rootsList_.selectionModel =
+        this.directoryModel_.getRootsListSelectionModel();
 
     // TODO(dgozman): add "Add a drive" item.
-    this.rootsList_.dataModel = this.directoryModel_.rootsList;
+    this.rootsList_.dataModel = this.directoryModel_.getRootsList();
     this.directoryModel_.updateRoots(function() {
         self.rootsList_.endBatchUpdates();
     }, false);
   };
 
   /**
    * @param {boolean} dirChanged True if we just changed to GData directory,
    *                             False if "Retry" button clicked.
    */
   FileManager.prototype.initGData_ = function(dirChanged) {
@@ skipping 325 matching lines @@
 
       case 'newfolder':
         return !readonly &&
                (this.dialogType_ == FileManager.DialogType.SELECT_SAVEAS_FILE ||
                 this.dialogType_ == FileManager.DialogType.FULL_PAGE);
 
       case 'unmount':
         return true;
 
       case 'format':
-        var entry =
-            this.getRootEntry_(this.rootsList_.selectionModel.selectedIndex);
+        var entry = this.directoryModel_.getCurrentRootDirEntry();
 
         return entry && DirectoryModel.getRootType(entry.fullPath) ==
                         DirectoryModel.RootType.REMOVABLE;
     }
   };
 
   FileManager.prototype.getRootEntry_ = function(index) {
     if (index == -1)
       return null;
 
@@ skipping 268 matching lines @@
 
       case 'delete':
         this.deleteEntries(this.selection.entries);
         return;
 
       case 'newfolder':
         this.onNewFolderCommand_(event);
         return;
 
       case 'unmount':
-        var entry =
-            this.getRootEntry_(this.rootsList_.selectionModel.selectedIndex);
-
-        this.unmountVolume_(entry);
+        this.unmountVolume_(this.directoryModel_.getCurrentRootDirEntry());
         return;
 
       case 'format':
-        var entry =
-            this.getRootEntry_(this.rootsList_.selectionModel.selectedIndex);
-
+        var entry = this.directoryModel_.getCurrentRootDirEntry();
         this.confirm.show(str('FORMATTING_WARNING'), function() {
           chrome.fileBrowserPrivate.formatDevice(entry.toURL());
         });
 
         return;
     }
   };
 
   /**
    * Respond to the back and forward buttons.
@@ skipping 386 matching lines @@
       return str('REMOVABLE_DIRECTORY_LABEL');
     if (isParentPath('/' + DirectoryModel.REMOVABLE_DIRECTORY, path))
       return path.substring(DirectoryModel.REMOVABLE_DIRECTORY.length + 2);
 
     if (path == '/' + DirectoryModel.GDATA_DIRECTORY)
       return str('GDATA_DIRECTORY_LABEL');
 
     return path;
   };
 
+  /**
+   * Handler for root item being clicked.
+   * @private
+   * @param {Entry} entry Entry to navigate to.
+   * @param {Event} event The event.
+   */
+  FileManager.prototype.onRootClick_ = function(entry, event) {
+    var new_path = entry.fullPath;
+    if (entry.fullPath == this.directoryModel_.getCurrentRootPath()) {
+      this.directoryModel_.changeDirectory(entry.fullPath);

[SeRya, 2012/04/23 14:23:43]

I think this code would be much more clear:

dm.changeDirectory(dm.getActivePathForRoot(entry.fullPath))

(assuming changeDirectory handles errors and getActivePathForRoot returns last
selected directory or root itself).

[Oleg Eterevsky, 2012/04/23 14:33:04]

I don't see how will it make the code simpler. The 'if' here handles the case
when user clicks on the already active root. It has nothing to do with any
'active' directory for root.

+    } else {
+      this.directoryModel_.changeRoot(entry.fullPath);
+    }
+  };
+
   FileManager.prototype.renderRoot_ = function(entry) {
     var li = this.document_.createElement('li');
     li.className = 'root-item';
     li.addEventListener('click', this.onRootClick_.bind(this, entry));
 
     var rootType = DirectoryModel.getRootType(entry.fullPath);
 
     var div = this.document_.createElement('div');
     div.className = 'root-label';
 
@@ skipping 31 matching lines @@
         cr.ui.contextMenuHandler.setContextMenu(li, this.rootsContextMenu_);
       }
     }
 
     cr.defineProperty(li, 'lead', cr.PropertyKind.BOOL_ATTR);
     cr.defineProperty(li, 'selected', cr.PropertyKind.BOOL_ATTR);
     return li;
   };
 
   /**
-   * Handler for root item being clicked.
-   * @param {Entry} entry to navigate to.
-   * @param {Event} event The event.
-   */
-  FileManager.prototype.onRootClick_ = function(entry, event) {
-    var path = this.directoryModel_.currentEntry.fullPath;
-    if (path.indexOf(entry.fullPath) == 0 && path != entry.fullPath) {
-      this.directoryModel_.changeDirectory(entry.fullPath);
-    }
-  };
-
-  /**
    * Unmounts device.
    * @param {Entry} entry The entry to unmount.
    */
   FileManager.prototype.unmountVolume_ = function(entry) {
     this.directoryModel_.prepareUnmount(entry.fullPath);
     this.unmountRequests_.push(entry.fullPath);
     chrome.fileBrowserPrivate.removeMount(entry.toURL());
   };
 
   FileManager.prototype.styleGDataItem_ = function(entry, listItem) {
@@ skipping 481 matching lines @@
     }
 
     function setVisibility(visibility) {
       panel.setAttribute('visibility', visibility);
     }
   };
 
 
   FileManager.prototype.isOnGData = function() {
     return this.directoryModel_ &&
-        this.directoryModel_.rootPath == '/' + DirectoryModel.GDATA_DIRECTORY;
+        this.directoryModel_.getCurrentRootPath() ==
+            '/' + DirectoryModel.GDATA_DIRECTORY;
   };
 
   FileManager.prototype.getMetadataProvider = function() {
     return this.metadataProvider_;
   };
 
   /**
    * Callback called when tasks for selected files are determined.
    * @param {Object} selection Selection is passed here, since this.selection
    *     can change before tasks were found, and we should be accurate.
@@ skipping 241 matching lines @@
         };
         // Not calling clearGDataLoadingTimer_ here because we want to keep
         // "Loading Google Docs" message until the directory loads. It is OK if
         // the timer fires after the mount because onDirectoryChanged_ will hide
         // the unmounted panel.
         if (this.setupCurrentDirectoryPostponed_) {
           this.setupCurrentDirectoryPostponed_(false /* execute */);
         } else if (this.isOnGData() &&
                    this.directoryModel_.currentEntry.unmounted) {
           // We are currently on an unmounted GData directory, force a rescan.
-          changeDirectoryTo = this.directoryModel_.rootPath;
+          changeDirectoryTo = this.directoryModel_.getCurrentRootPath();
         }
       } else {
         this.gdataMounted_ = false;
         this.gdataMountInfo_ = null;
         this.clearGDataLoadingTimer_();
         this.onGDataUnreachable_('GData mount failed: ' + event.status);
         if (this.setupCurrentDirectoryPostponed_) {
           this.setupCurrentDirectoryPostponed_(true /* cancel */);
           // Change to unmounted GData root.
           changeDirectoryTo = '/' + DirectoryModel.GDATA_DIRECTORY;
@@ skipping 25 matching lines @@
       if (event.eventType == 'unmount') {
         // Unmount request finished - remove it.
         var index = self.unmountRequests_.indexOf(event.mountPath);
         if (index != -1) {
           self.unmountRequests_.splice(index, 1);
           if (event.status != 'success')
             self.alert.show(strf('UNMOUNT_FAILED', event.status));
         }
 
         if (event.status == 'success' &&
-            event.mountPath == self.directoryModel_.rootPath) {
+            event.mountPath == self.directoryModel_.getCurrentRootPath()) {
           if (self.params_.mountTriggered && index == -1) {
             // This device mount was the reason this File Manager instance was
             // created. Now the device is unmounted from another instance
             // or the user removed the device manually. Close this instance.
             // window.close() sometimes doesn't work.
             chrome.tabs.getCurrent(function(tab) {
               chrome.tabs.remove(tab.id);
             });
             return;
           }
@@ skipping 131 matching lines @@
 
     galleryFrame.onload = function() {
       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 downloadsDir = self.directoryModel_.getRootsList().item(0);
 
       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,
@@ skipping 15 matching lines @@
     this.openFilePopup_(galleryFrame);
   };
 
   /**
    * Update the breadcrumb display to reflect the current directory.
    */
   FileManager.prototype.updateBreadcrumbs_ = function() {
     var bc = this.dialogDom_.querySelector('.breadcrumbs');
     removeChildren(bc);
 
-    var rootPath = this.directoryModel_.rootPath;
+    var rootPath = this.directoryModel_.getCurrentRootPath();
     var relativePath = this.directoryModel_.currentEntry.fullPath.
                        substring(rootPath.length).replace(/\/$/, '');
 
     var pathNames = relativePath.replace(/\/$/, '').split('/');
     if (pathNames[0] == '')
       pathNames.splice(0, 1);
 
     // We need a first breadcrumb for root, so placing last name from
     // rootPath as first name of relativePath.
     var rootPathNames = rootPath.replace(/\/$/, '').split('/');
@@ skipping 1426 matching lines @@
 
       handleSplitterDragEnd: function(e) {
         Splitter.prototype.handleSplitterDragEnd.apply(this, arguments);
         this.ownerDocument.documentElement.classList.remove('col-resize');
       }
     };
 
     customSplitter.decorate(splitterElement);
   };
 })();