Some filebrowser bugs and retiring DiskChanged event in filebrowser

chrome/browser/resources/file_manager/js/file_manager.js

 // Copyright (c) 2011 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.
 
 // Setting the src of an img to an empty string can crash the browser, so we
 // use an empty 1x1 gif instead.
 const EMPTY_IMAGE_URI = 'data:image/gif;base64,'
         + 'R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw%3D%3D';
 
 var g_slideshow_data = null;
@@ skipping 121 matching lines @@
     this.onFileTaskExecute_.bind(this));
 
   this.initCommands_();
   this.initDom_();
   this.initDialogType_();
   this.setupCurrentDirectory_();
 
   this.summarizeSelection_();
   this.updatePreview_();
 
-  chrome.fileBrowserPrivate.onDiskChanged.addListener(
-      this.onDiskChanged_.bind(this));
-
   this.refocus();
 
   // Pass all URLs to the metadata reader until we have a correct filter.
   this.metadataUrlFilter_ = /.*/;
 
   this.metadataReader_ = new Worker('js/metadata_dispatcher.js');
   this.metadataReader_.onmessage = this.onMetadataMessage_.bind(this);
   this.metadataReader_.postMessage({verb: 'init'});
   // Initialization is not complete until the Worker sends back the
   // 'initialized' message.  See below.
@@ skipping 1523 matching lines @@
                 var fileName = event.sourceUrl.substr(
                     event.sourceUrl.lastIndexOf('/') + 1);
                 self.alert.show(strf('ARCHIVE_MOUNT_FAILED', fileName,
                                      event.status));
               }
             }
             return;
           }
         }
       }
+
+      if (event.eventType == 'unmount' && event.status == 'success' &&
+          self.currentDirEntry_ &&
+          isParentPath(event.mountPath, self.currentDirEntry_.fullPath)) {
+        self.changeDirectory(getParentPath(event.mountPath));
+        return;
+      }
+
       // TODO(dgozman): rescan directory, only if it contains mounted points,
       // when mounts location will be decided.
-      this.rescanDirectory_();
+      if (event.status == 'success')
+        self.rescanDirectory_();
     });
   };
 
   /**
    * Event handler called when some internal task should be executed.
    */
   FileManager.prototype.onFileTaskExecute_ = function(id, details) {
     var urls = details.entries.map(function(entry) {
         return entry.toURL();
     });
@@ skipping 733 matching lines @@
     this.rescanDirectory_(function() {
         if (event.selectedEntry)
           self.selectEntry(event.selectedEntry);
         // For tests that open the dialog to empty directories, everything
         // is loaded at this point.
         chrome.test.sendMessage('directory-change-complete');
       });
   };
 
   /**
-   * Update the UI when a disk is mounted or unmounted.
-   *
-   * @param {string} path The path that has been mounted or unmounted.
-   */
-  FileManager.prototype.onDiskChanged_ = function(event) {
-    if (event.eventType == 'added') {
-      this.changeDirectory(event.volumeInfo.mountPath);
-    } else if (event.eventType == 'removed') {
-      if (this.currentDirEntry_ &&
-          isParentPath(event.volumeInfo.mountPath,
-                       this.currentDirEntry_.fullPath)) {
-        this.changeDirectory(getParentPath(event.volumeInfo.mountPath));
-      }
-    }
-  };
-
-  /**
    * Rescan the current directory, refreshing the list.
    *
    * @param {function()} opt_callback Optional function to invoke when the
    *     rescan is complete.
    */
   FileManager.prototype.rescanDirectory_ = function(opt_callback) {
     var self = this;
     var reader;
 
     function onReadSome(entries) {
@@ skipping 610 matching lines @@
 
     if (msg) {
       console.log('no no no');
       this.alert.show(msg, onAccept);
       return false;
     }
 
     return true;
   };
 })();