Rename DriveProvider to ExternalProvider.

ui/file_manager/gallery/js/gallery.js

 // Copyright 2014 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';
 
 /**
  * Called from the main frame when unloading.
  * @param {boolean=} opt_exiting True if the app is exiting.
  */
@@ skipping 47 matching lines @@
  */
 GalleryDataModel.MAX_SCREEN_IMAGE_CACHE_ = 5;
 
 GalleryDataModel.prototype = {
   __proto__: cr.ui.ArrayDataModel.prototype
 };
 
 /**
  * Saves new image.
  *
+ * @param {VolumeManager} volumeManager Volume manager instance.
  * @param {Gallery.Item} item Original gallery item.
  * @param {Canvas} canvas Canvas containing new image.
  * @param {boolean} overwrite Whether to overwrite the image to the item or not.
  * @return {Promise} Promise to be fulfilled with when the operation completes.
  */
-GalleryDataModel.prototype.saveItem = function(item, canvas, overwrite) {
+GalleryDataModel.prototype.saveItem = function(
+    volumeManager, item, canvas, overwrite) {
   var oldEntry = item.getEntry();
   var oldMetadata = item.getMetadata();
+  var oldLocationInfo = item.getLocationInfo();
   var metadataEncoder = ImageEncoder.encodeMetadata(
       item.getMetadata(), canvas, 1 /* quality */);
   var newMetadata = ContentProvider.ConvertContentMetadata(
       metadataEncoder.getMetadata(),
       MetadataCache.cloneMetadata(item.getMetadata()));
   if (newMetadata.filesystem)
     newMetadata.filesystem.modificationTime = new Date();
-  if (newMetadata.drive)
-    newMetadata.drive.present = true;
+  if (newMetadata.external)
+    newMetadata.external.present = true;
 
   return new Promise(function(fulfill, reject) {
     item.saveToFile(
+        volumeManager,
         this.fallbackSaveDirectory,
         overwrite,
         canvas,
         metadataEncoder,
         function(success) {
           if (!success) {
             reject('Failed to save the image.');
             return;
           }
 
@@ skipping 12 matching lines @@
             // Need an update of metdataCache.
             this.metadataCache_.set(
                 item.getEntry(),
                 Gallery.METADATA_TYPE,
                 newMetadata);
           } else {
             // New entry is added and the item now tracks it.
             // Add another item for the old entry.
             var anotherItem = new Gallery.Item(
                 oldEntry,
+                oldLocationInfo,
                 oldMetadata,
                 this.metadataCache_,
-                item.isOriginal(),
-                item.isReadOnly());
+                item.isOriginal());
             // The item must be added behind the existing item so that it does
             // not change the index of the existing item.
             // TODO(hirono): Update the item index of the selection model
             // correctly.
             this.splice(this.indexOf(item) + 1, 0, anotherItem);
           }
 
           fulfill();
         }.bind(this));
   }.bind(this));
@@ skipping 66 matching lines @@
     loadTimeData: {}
   };
   this.container_ = document.querySelector('.gallery');
   this.document_ = document;
   this.metadataCache_ = this.context_.metadataCache;
   this.volumeManager_ = volumeManager;
   this.selectedEntry_ = null;
   this.metadataCacheObserverId_ = null;
   this.onExternallyUnmountedBound_ = this.onExternallyUnmounted_.bind(this);
 
-  this.dataModel_ = new GalleryDataModel(this.context_.metadataCache);
+  this.dataModel_ = new GalleryDataModel(
+      this.context_.metadataCache);
   var downloadVolumeInfo = this.volumeManager_.getCurrentProfileVolumeInfo(
       VolumeManagerCommon.VolumeType.DOWNLOADS);
   downloadVolumeInfo.resolveDisplayRoot().then(function(entry) {
     this.dataModel_.fallbackSaveDirectory = entry;
   }.bind(this)).catch(function(error) {
     console.error(
         'Failed to obtain the fallback directory: ' + (error.stack || error));
   });
   this.selectionModel_ = new cr.ui.ListSelectionModel();
 
@@ skipping 26 matching lines @@
  * @const
  * @type {number}
  */
 Gallery.MOSAIC_BACKGROUND_INIT_DELAY = 1000;
 
 /**
  * Types of metadata Gallery uses (to query the metadata cache).
  * @const
  * @type {string}
  */
-Gallery.METADATA_TYPE = 'thumbnail|filesystem|media|drive';
+Gallery.METADATA_TYPE = 'thumbnail|filesystem|media|external';
 
 /**
  * Initializes listeners.
  * @private
  */
 Gallery.prototype.initListeners_ = function() {
   this.keyDownBound_ = this.onKeyDown_.bind(this);
   this.document_.body.addEventListener('keydown', this.keyDownBound_);
 
   this.inactivityWatcher_ = new MouseInactivityWatcher(
@@ skipping 106 matching lines @@
                                     this.volumeManager_,
                                     this.toggleMode_.bind(this, null));
 
   this.slideMode_ = new SlideMode(this.container_,
                                   content,
                                   this.toolbar_,
                                   this.prompt_,
                                   this.dataModel_,
                                   this.selectionModel_,
                                   this.context_,
+                                  this.volumeManager_,
                                   this.toggleMode_.bind(this),
                                   str);
 
   this.slideMode_.addEventListener('image-displayed', function() {
     cr.dispatchSimpleEvent(this, 'image-displayed');
   }.bind(this));
   this.slideMode_.addEventListener('image-saved', function() {
     cr.dispatchSimpleEvent(this, 'image-saved');
   }.bind(this));
 
@@ skipping 88 matching lines @@
       // Obtains metadata for chunk.
       var entries = chunk.map(function(chunkItem) {
         return chunkItem.entry;
       });
       self.metadataCache_.get(entries, Gallery.METADATA_TYPE, fulfill);
     }).then(function(metadataList) {
       if (chunk.length !== metadataList.length)
         return Promise.reject('Failed to load metadata.');
 
       // Add items to the model.
-      var items = chunk.map(function(chunkItem, index) {
-        var volumeInfo = self.volumeManager_.getVolumeInfo(chunkItem.entry);
+      var items = [];
+      chunk.forEach(function(chunkItem, index) {
+        var locationInfo = self.volumeManager_.getLocationInfo(chunkItem.entry);
+        if (!locationInfo)  // Skip the item, since gone.
+          return;
         var clonedMetadata = MetadataCache.cloneMetadata(metadataList[index]);
-        return new Gallery.Item(
+        items.push(new Gallery.Item(
             chunkItem.entry,
+            locationInfo,
             clonedMetadata,
             self.metadataCache_,
-            /* original */ true,
-            /* readonly */ !!(volumeInfo && volumeInfo.isReadOnly));
+            /* original */ true));
       });
       self.dataModel_.push.apply(self.dataModel_, items);
 
       // Apply the selection.
       var selectionUpdated = false;
       for (var i = 0; i < chunk.length; i++) {
         if (!chunk[i].selected)
           continue;
         var index = self.dataModel_.indexOf(items[i]);
         if (index < 0)
@@ skipping 332 matching lines @@
     this.selectedEntry_ = selectedItem.getEntry();
     selectedEntryURL = this.selectedEntry_.toURL();
 
     // Update cache.
     selectedItem.touch();
     this.dataModel_.evictCache();
 
     // Update the title and the display name.
     if (numSelectedItems === 1) {
       document.title = this.selectedEntry_.name;
-      this.filenameEdit_.disabled = selectedItem.isReadOnly();
+      this.filenameEdit_.disabled = selectedItem.getLocationInfo().isReadOnly;
       this.filenameEdit_.value =
           ImageUtil.getDisplayNameFromName(this.selectedEntry_.name);
-      this.shareButton_.hidden = !selectedItem.isOnDrive();
+      this.shareButton_.hidden = !selectedItem.getLocationInfo().isDriveBased;
     } else {
       if (this.context_.curDirEntry) {
         // If the Gallery was opened on search results the search query will not
         // be recorded in the app state and the relaunch will just open the
         // gallery in the curDirEntry directory.
         document.title = this.context_.curDirEntry.name;
       } else {
         document.title = '';
       }
       this.filenameEdit_.disabled = true;
@@ skipping 149 matching lines @@
   window.loadTimeData.data = backgroundComponents.stringData;
   gallery = new Gallery(backgroundComponents.volumeManager);
 };
 
 /**
  * Loads entries.
  */
 window.loadEntries = function(entries, selectedEntries) {
   gallery.load(entries, selectedEntries);
 };