Files app: Update directory contents properly while Drive files are being fetched

chrome/browser/resources/file_manager/js/directory_model.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.
 
 // If directory files changes too often, don't rescan directory more than once
 // per specified interval
 var SIMULTANEOUS_RESCAN_INTERVAL = 1000;
 // Used for operations that require almost instant rescan.
 var SHORT_RESCAN_INTERVAL = 100;
 
@@ skipping 752 matching lines @@
  * changed.
  *
  * @private
  * @param {boolean} initial True if it comes from setupPath and
  *                          false if caused by an user action.
  * @param {DirectoryEntry} dirEntry The absolute path to the new directory.
  * @param {function} opt_callback Executed if the directory loads successfully.
  */
 DirectoryModel.prototype.changeDirectoryEntry_ = function(initial, dirEntry,
                                                           opt_callback) {
-  if (dirEntry == DirectoryModel.fakeGDataEntry_)
+  if (dirEntry == DirectoryModel.fakeGDataEntry_ &&
+      this.volumeManager_.getGDataStatus() ==
+          VolumeManager.GDataStatus.UNMOUNTED)
     this.volumeManager_.mountGData(function() {}, function() {});
 
   this.clearSearch_();
   var previous = this.currentDirContents_.getDirectoryEntry();
   this.changeDirectoryEntrySilent_(dirEntry, opt_callback);
 
   var e = new cr.Event('directory-changed');
   e.previousDirEntry = previous;
   e.newDirEntry = dirEntry;
   e.initial = initial;
@@ skipping 290 matching lines @@
 
 /**
  * @private
  */
 DirectoryModel.prototype.updateRootsListSelection_ = function() {
   var rootPath = this.getCurrentRootPath();
   this.rootsListSelection_.selectedIndex = this.findRootsListIndex(rootPath);
 };
 
 /**
- * @return {true} True if GDATA mounted.
+ * @return {boolean} True if GDATA if fully mounted.

[dgozman, 2012/10/11 12:25:43]

typo: if -> is

  * @private
  */
 DirectoryModel.prototype.isGDataMounted_ = function() {
-  return this.volumeManager_.isMounted(RootDirectory.GDATA);
+  return this.volumeManager_.getGDataStatus() ==
+      VolumeManager.GDataStatus.MOUNTED;
 };
 
 /**
  * Handler for the VolumeManager's event.
  * @private
  */
 DirectoryModel.prototype.onMountChanged_ = function() {
   this.updateRoots_();
 
   var rootType = this.getCurrentRootType();
@@ skipping 268 matching lines @@
         }.bind(this));
   }
 };
 
 /**
  * @return {DirectoryEntry} Current watched directory entry.
  */
 FileWatcher.prototype.getWatchedDirectoryEntry = function() {
   return this.watchedDirectoryEntry_;
 };