[File Manager] Use content url for playing media files from a gdata directory

chrome/browser/resources/file_manager/js/image_editor/image_view.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.
 
 /**
  * The overlay displaying the image.
  */
 function ImageView(container, viewport) {
   this.container_ = container;
   this.viewport_ = viewport;
@@ skipping 162 matching lines @@
 
   var self = this;
 
   this.contentID_ = id;
 
   if (FileType.getMediaType(source) == 'video') {
     var video = this.document_.createElement('video');
     if (metadata.thumbnailURL) {
       video.setAttribute('poster', metadata.thumbnailURL);
     }
-    if (!metadata.thumbnailOnly) {
-      video.src = source;
-      video.load();
-    }
+    video.src = metadata.contentURL || source;
+    video.load();
     displayMainImage(ImageView.LOAD_TYPE_TOTAL, video);
     return;
   }
   var readyContent = this.getReadyContent(id, source);
   if (readyContent) {
     displayMainImage(ImageView.LOAD_TYPE_CACHED_FULL, readyContent);
   } else {
     var cachedScreen = this.screenCache_.getItem(id);
     if (cachedScreen) {
       // We have a cached screen-scale canvas, use it instead of a thumbnail.
@@ skipping 18 matching lines @@
 
     var mainImageLoadDelay = ImageView.ANIMATION_WAIT_INTERVAL;
 
     // Do not do slide-in animation when scrolling very fast.
     if (self.lastLoadTime_ &&
         (time - self.lastLoadTime_) < ImageView.FAST_SCROLL_INTERVAL) {
       slide = 0;
     }
     self.lastLoadTime_ = time;
 
-    if (metadata.thumbnailOnly) {
+    if (metadata.contentURL) {
+      source = metadata.contentURL;

[dgozman, 2012/03/11 13:17:41]

Where is |source| defined and used?

[Vladislav Kaznacheev, 2012/03/11 14:09:53]

This is a parameter, and yes, this is ugly. I refactored the code to avoid that
kind of parameter modifications.

On 2012/03/11 13:17:41, dgozman wrote:

       // We do not know the main image size, but chances are that it is large
       // enough. Show the thumbnail at the maximum possible scale.
       var bounds = self.viewport_.getScreenBounds();
       var scale = Math.min (bounds.width / canvas.width,
                             bounds.height / canvas.height);
       self.replace(canvas, slide, canvas.width * scale, canvas.height * scale);
-      if (opt_callback) opt_callback(ImageView.LOAD_TYPE_TOTAL);
-      return;
+    } else {
+      self.replace(canvas, slide, metadata.width, metadata.height);
     }
-
-    self.replace(canvas, slide, metadata.width, metadata.height);
     if (!slide) mainImageLoadDelay = 0;
     slide = 0;
     loadMainImage(loadType, mainImageLoadDelay);
   }
 
   function loadMainImage(loadType, delay) {
     if (self.prefetchLoader_.isLoading(source)) {
       // The image we need is already being prefetched. Initiating another load
       // would be a waste. Hijack the load instead by overriding the callback.
       self.prefetchLoader_.setCallback(displayMainImage.bind(null, loadType));
@@ skipping 275 matching lines @@
   if (this.order_.length > this.capacity_)
     throw new Error('Exceeded cache capacity');
 };
 
 ImageView.Cache.prototype.evictLRU = function() {
   if (this.order_.length == this.capacity_) {
     var id = this.order_.shift();
     delete this.map_[id];
   }
 };