gdata: Apply correct mount label when mounting archives in GData

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 676 matching lines @@
       this.unmountedPanel_.setAttribute('loading', true);
     }
 
     // If the user changed to another directory and then back to GData we
     // re-enter this method while the timer is still active. In this case
     // we only update the UI but do not request the mount again.
     if (this.gdataLoadingTimer_)
       return;
 
     metrics.startInterval('Load.GData');
-    chrome.fileBrowserPrivate.addMount('', 'gdata', {});
+    chrome.fileBrowserPrivate.addMount('', 'gdata', {},
+                                       function(sourcePath) {});
 
     // This timer could fire before the mount succeeds. We will silently
     // replace the error message with the correct directory contents.
     this.gdataLoadingTimer_ = setTimeout(function() {
           this.gdataLoadingTimer_ = null;
           this.onGDataUnreachable_('GData load timeout');
         }.bind(this),
         15 * 60 * 1000);
   };
 
@@ skipping 1835 matching lines @@
 
     var changeDirectoryTo = null;
 
     if (event && event.mountType == 'gdata') {
       metrics.recordInterval('Load.GData');
       console.log('GData mounted');
       if (event.status == 'success') {
         this.gdataMounted_ = true;
         this.gdataMountInfo_ = {
           'mountPath': event.mountPath,
-          'sourceUrl': event.sourceUrl,
+          'sourcePath': event.sourcePath,
           'mountType': event.mountType,
           'mountCondition': event.status
         };
         // 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() &&
@@ skipping 13 matching lines @@
         }
       }
     }
 
     chrome.fileBrowserPrivate.getMountPoints(function(mountPoints) {
       self.setMountPoints_(mountPoints);
 
       if (event.eventType == 'mount') {
         // Mount request finished - remove it.
         // Currently we only request mounts for archive files.
-        var index = self.mountRequests_.indexOf(event.sourceUrl);
+        var index = self.mountRequests_.indexOf(event.sourcePath);
         if (index != -1) {
           self.mountRequests_.splice(index, 1);
           if (event.status == 'success') {
             // Successful mount requested from this tab, go to the drive root.
             changeDirectoryTo = event.mountPath;
           } else {
             // Request initiated from this tab failed, report the error.
-            var fileName = event.sourceUrl.split('/').pop();
+            var fileName = event.sourcePath.split('/').pop();
             self.alert.show(
                 strf('ARCHIVE_MOUNT_FAILED', fileName, event.status));
           }
         }
       }
 
       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_.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;
           }
           // Current directory just unmounted. Move to the 'Downloads'.
-          changeDirectoryTo = this.directoryModel_.getDefaultDirectory();
+          changeDirectoryTo = self.directoryModel_.getDefaultDirectory();
         }
       }
 
       // Even if something failed root list should be rescanned.
       // Failed mounts can "give" us new devices which might be formatted,
       // so we have to refresh root list then.
       self.directoryModel_.updateRoots(function() {
         if (changeDirectoryTo) {
           self.directoryModel_.changeDirectory(changeDirectoryTo);
         }
@@ skipping 15 matching lines @@
         position = urls.indexOf(selectedUrl);
       }
       chrome.mediaPlayerPrivate.play(urls, position);
     } else if (id == 'mount-archive') {
       var self = this;
       this.resolveSelectResults_(urls, function(urls) {
         for (var index = 0; index < urls.length; ++index) {
           // Url in MountCompleted event won't be escaped, so let's make sure
           // we don't use escaped one in mountRequests_.
           var unescapedUrl = unescape(urls[index]);
-          self.mountRequests_.push(unescapedUrl);
-          chrome.fileBrowserPrivate.addMount(unescapedUrl, 'file', {});
+          chrome.fileBrowserPrivate.addMount(unescapedUrl, 'file', {},
+            function(sourcePath) {
+              self.mountRequests_.push(sourcePath);
+          });
         }
       });
     } else if (id == 'format-device') {
       this.confirm.show(str('FORMATTING_WARNING'), function() {
         chrome.fileBrowserPrivate.formatDevice(urls[0]);
       });
     } else if (id == 'gallery') {
       this.openGallery_(urls);
     } else if (id == 'view-pdf' || id == 'view-in-browser' ||
         id == 'install-crx' || id == 'open-hosted') {
@@ skipping 1690 matching lines @@
 
     this.directoryModel_.addEventListener('scan-completed', maybeShowBanner);
     this.directoryModel_.addEventListener('rescan-completed', maybeShowBanner);
 
     var style = this.document_.createElement('link');
     style.rel = 'stylesheet';
     style.href = 'css/gdrive_welcome.css';
     this.document_.head.appendChild(style);
   };
 })();