Add thumbnailMetadataItem to GalleryItem.

ui/file_manager/gallery/js/image_editor/image_view.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.
 
 /**
  * The overlay displaying the image.
  *
  * @param {!HTMLElement} container The container element.
  * @param {!Viewport} viewport The viewport.
  * @param {!MetadataModel} metadataModel
@@ skipping 134 matching lines @@
  * @param {!ImageView.Effect} effect
  * @return {ImageView.LoadTarget} Load target.
  */
 ImageView.getLoadTarget = function(item, effect) {
   if (item.contentImage)
     return ImageView.LoadTarget.CACHED_MAIN_IMAGE;
   if (item.screenImage)
     return ImageView.LoadTarget.CACHED_THUMBNAIL;
 
   // Only show thumbnails if there is no effect or the effect is Slide.
-  var metadata = item.getMetadata();
   var thumbnailLoader = new ThumbnailLoader(
-      item.getEntry(), ThumbnailLoader.LoaderType.CANVAS, item.getMetadata());
+      item.getEntry(),
+      ThumbnailLoader.LoaderType.CANVAS,
+      item.getThumbnailMetadataItem());
   if ((effect instanceof ImageView.Effect.None ||
        effect instanceof ImageView.Effect.Slide) &&
       thumbnailLoader.getLoadTarget() !==
       ThumbnailLoader.LoadTarget.FILE_ENTRY) {
     return ImageView.LoadTarget.THUMBNAIL;
   }
 
   return ImageView.LoadTarget.MAIN_IMAGE;
 };
 
@@ skipping 175 matching lines @@
  * @param {!Gallery.Item} item Gallery item to be loaded.
  * @param {!ImageView.Effect} effect Transition effect object.
  * @param {function()} displayCallback Called when the image is displayed
  *     (possibly as a preview).
  * @param {function(!ImageView.LoadType, number, *=)} loadCallback Called when
  *     the image is fully loaded. The first parameter is the load type.
  */
 ImageView.prototype.load =
     function(item, effect, displayCallback, loadCallback) {
   var entry = item.getEntry();
-  var metadata = item.getMetadata() || {};
 
   if (!(effect instanceof ImageView.Effect.None)) {
     // Skip effects when reloading repeatedly very quickly.
     var time = Date.now();
     if (this.lastLoadTime_ &&
         (time - this.lastLoadTime_) < ImageView.FAST_SCROLL_INTERVAL) {
       effect = new ImageView.Effect.None();
     }
     this.lastLoadTime_ = time;
   }
@@ skipping 18 matching lines @@
       displayThumbnail(ImageView.LoadType.CACHED_SCREEN, item.screenImage);
       // As far as the user can tell the image is loaded. We still need to load
       // the full res image to make editing possible, but we can report now.
       ImageUtil.metrics.recordInterval(ImageUtil.getMetricName('DisplayTime'));
       break;
 
     case ImageView.LoadTarget.THUMBNAIL:
       var thumbnailLoader = new ThumbnailLoader(
           entry,
           ThumbnailLoader.LoaderType.CANVAS,
-          metadata);
+          item.getThumbnailMetadataItem());
       thumbnailLoader.loadDetachedImage(function(success) {
         displayThumbnail(
             ImageView.LoadType.IMAGE_FILE,
             success ? thumbnailLoader.getImage() : null);
       });
       break;
 
     case ImageView.LoadTarget.MAIN_IMAGE:
       loadMainImage(
           ImageView.LoadType.IMAGE_FILE,
@@ skipping 75 matching lines @@
     }
 
     if (loadType !== ImageView.LoadType.ERROR &&
         loadType !== ImageView.LoadType.CACHED_SCREEN) {
       ImageUtil.metrics.recordInterval(ImageUtil.getMetricName('DisplayTime'));
     }
     ImageUtil.metrics.recordEnum(ImageUtil.getMetricName('LoadMode'),
         loadType, Object.keys(ImageView.LoadType).length);
 
     if (loadType === ImageView.LoadType.ERROR &&
-        !navigator.onLine && !metadata.external.present) {
+        !navigator.onLine && !item.getMetadataItem().present) {
       loadType = ImageView.LoadType.OFFLINE;
     }
     if (loadCallback) loadCallback(loadType, animationDuration, opt_error);
   }
 };
 
 /**
  * Prefetches an image.
  * @param {!Gallery.Item} item The image item.
  * @param {number=} opt_delay Image load delay in ms.
@@ skipping 468 matching lines @@
 };
 
 ImageView.Effect.Rotate.prototype = { __proto__: ImageView.Effect.prototype };
 
 /**
  * @override
  */
 ImageView.Effect.Rotate.prototype.transform = function(element, viewport) {
   return viewport.getInverseTransformForRotatedImage(this.orientation_);
 };