Add thumbnailMetadataItem to GalleryItem.

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.
 
 /**
  * Overrided metadata worker's path.
  * @type {string}
  */
 ContentProvider.WORKER_SCRIPT = '/js/metadata_worker.js';
 ContentMetadataProvider.WORKER_SCRIPT = '/js/metadata_worker.js';
@@ skipping 49 matching lines @@
   /**
    * @private {!ThumbnailModel}
    * @const
    */
   this.thumbnailModel_ = new ThumbnailModel(this.metadataModel_);
   this.selectedEntry_ = null;
   this.metadataCacheObserverId_ = null;
   this.onExternallyUnmountedBound_ = this.onExternallyUnmounted_.bind(this);
   this.initialized_ = false;
 
-  this.dataModel_ = new GalleryDataModel(
-      this.context_.metadataCache,
-      this.metadataModel_);
+  this.dataModel_ = new GalleryDataModel(this.metadataModel_);
   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 170 matching lines @@
  * @const
  * @type {string}
  */
 Gallery.METADATA_TYPE = 'thumbnail|filesystem|media|external';
 
 /**
  * Types of metadata Gallery uses (to query the metadata cache).
  * @const
  * @type {!Array<string>}
  */
-Gallery.PREFETCH_PROPERTY_NAMES = ['imageWidth', 'imageHeight', 'size'];
+Gallery.PREFETCH_PROPERTY_NAMES =
+    ['imageWidth', 'imageHeight', 'size', 'present'];

[mtomasz, 2015/03/04 09:29:59]

nit: Why present is added?
nit: Is size used?

 
 /**
  * Closes gallery when a volume containing the selected item is unmounted.
  * @param {!Event} event The unmount event.
  * @private
  */
 Gallery.prototype.onExternallyUnmounted_ = function(event) {
   if (!this.selectedEntry_)
     return;
 
@@ skipping 89 matching lines @@
   });
 
   if (loadingList.length === 0) {
     this.dataModel_.splice(0, this.dataModel_.length);
     return;
   }
 
   // Load entries.
   // Use the self variable capture-by-closure because it is faster than bind.
   var self = this;
+  var thumbnailModel = new ThumbnailModel(this.metadataModel_);
   var loadChunk = function(firstChunk) {
     // Extract chunk.
     var chunk = loadingList.splice(0, maxChunkSize);
     if (!chunk.length)
       return;
     var entries = chunk.map(function(chunkItem) {
       return chunkItem.entry;
     });
-    var oldMetadataPromise = new Promise(function(fulfill) {
-      // Obtains metadata for chunk.
-      self.metadataCache_.get(entries, Gallery.METADATA_TYPE, fulfill);
-    }).then(function(metadataList) {
-      if (chunk.length !== metadataList.length)
-        return Promise.reject('Failed to load metadata.');
-      return metadataList;
-    });
     var metadataPromise = self.metadataModel_.get(
         entries, Gallery.PREFETCH_PROPERTY_NAMES);
-    return Promise.all([oldMetadataPromise, metadataPromise]).then(
+    var thumbnailPromise = thumbnailModel.get(entries);
+    return Promise.all([metadataPromise, thumbnailPromise]).then(
         function(metadataLists) {
       // Remove all the previous items if it's the first chunk.
       // Do it here because prevent a flicker between removing all the items
       // and adding new ones.
       if (firstChunk) {
         self.dataModel_.splice(0, self.dataModel_.length);
         self.updateThumbnails_();  // Remove the caches.
       }
 
       // Add items to the model.
       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(metadataLists[0][index]);
         items.push(new Gallery.Item(
             chunkItem.entry,
             locationInfo,
-            clonedMetadata,
+            metadataLists[0][index],
             metadataLists[1][index],
-            self.metadataCache_,
-            self.metadataModel_,
             /* 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]);
@@ skipping 408 matching lines @@
  */
 Gallery.prototype.onFilenameEditBlur_ = function(event) {
   var item = this.getSingleSelectedItem();
   if (item) {
     var oldEntry = item.getEntry();
 
     item.rename(this.filenameEdit_.value).then(function() {
       var event = new Event('content');
       event.item = item;
       event.oldEntry = oldEntry;
-      event.metadata = null;  // Metadata unchanged.
+      event.thumbnailChanged = false;
       this.dataModel_.dispatchEvent(event);
     }.bind(this), function(error) {
       if (error === 'NOT_CHANGED')
         return Promise.resolve();
       this.filenameEdit_.value =
           ImageUtil.getDisplayNameFromName(item.getEntry().name);
       this.filenameEdit_.focus();
       if (typeof error === 'string')
         this.prompt_.showStringAt('center', error, 5000);
       else
@@ skipping 143 matching lines @@
 initializePromise.then(reload);
 
 /**
  * Enteres the debug mode.
  */
 window.debugMe = function() {
   initializePromise.then(function() {
     gallery.debugMe();
   });
 };