Reland of 260688: [Files.app] Use getDriveEntryProperties to retrieve metadata

chrome/browser/resources/file_manager/foreground/js/metadata/metadata_cache.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.
 
 'use strict';
 
 /**
  * MetadataCache is a map from Entry to an object containing properties.
  * Properties are divided by types, and all properties of one type are accessed
  * at once.
@@ skipping 97 matching lines @@
  * Margin of the cache size. This amount of caches may be kept in addition.
  */
 MetadataCache.EVICTION_THRESHOLD_MARGIN = 500;
 
 /**
  * @param {VolumeManagerWrapper} volumeManager Volume manager instance.
  * @return {MetadataCache!} The cache with all providers.
  */
 MetadataCache.createFull = function(volumeManager) {
   var cache = new MetadataCache();
+  // DriveProvider should be prior to FileSystemProvider, because it covers
+  // FileSystemProvider for files in Drive.
+  cache.providers_.push(new DriveProvider(volumeManager));
   cache.providers_.push(new FilesystemProvider());
-  cache.providers_.push(new DriveProvider(volumeManager));
   cache.providers_.push(new ContentProvider());
   return cache;
 };
 
 /**
  * Clones metadata entry. Metadata entries may contain scalars, arrays,
  * hash arrays and Date object. Other objects are not supported.
  * @param {Object} metadata Metadata object.
  * @return {Object} Cloned entry.
  */
@@ skipping 544 matching lines @@
  */
 FilesystemProvider.prototype.fetch = function(
     entry, type, callback) {
   function onError(error) {
     callback(null);
   }
 
   function onMetadata(entry, metadata) {
     callback({
       filesystem: {
-        size: entry.isFile ? (metadata.size || 0) : -1,
+        size: (metadata.size || 0),
         modificationTime: metadata.modificationTime
       }
     });
   }
 
   entry.getMetadata(onMetadata.bind(null, entry), onError);
 };
 
 /**
  * Provider of drive metadata.
@@ skipping 33 matching lines @@
   var locationInfo = this.volumeManager_.getLocationInfo(entry);
   return locationInfo && locationInfo.isDriveBased;
 };
 
 /**
  * @param {string} type The metadata type.
  * @return {boolean} Whether this provider provides this metadata.
  */
 DriveProvider.prototype.providesType = function(type) {
   return type === 'drive' || type === 'thumbnail' ||
-      type === 'streaming' || type === 'media';
+      type === 'streaming' || type === 'media' || type === 'filesystem';
 };
 
 /**
  * @return {string} Unique provider id.
  */
 DriveProvider.prototype.getId = function() { return 'drive'; };
 
 /**
  * Fetches the metadata.
  * @param {Entry} entry File entry.
@@ skipping 83 matching lines @@
     imageHeight: data.imageHeight,
     imageRotation: data.imageRotation,
     availableOffline: DriveProvider.isAvailableOffline(data, entry),
     availableWhenMetered: DriveProvider.isAvailableWhenMetered(data),
     customIconUrl: data.customIconUrl || '',
     contentMimeType: data.contentMimeType || '',
     sharedWithMe: data.sharedWithMe,
     shared: data.shared
   };
 
+  result.filesystem = {
+    size: (entry.isFile ? (data.fileSize || 0) : -1),

[hirono, 2014/03/17 02:28:00]

How about this line?

[yoshiki, 2014/03/17 04:06:15]

Sorry, I was misunderstood and changed my mind. I thought a size value of 
directory would be ignored, but it's wrong.

I think we should keep it returning '-1' if it's directory. In Files.app, we
distinguish looks between a 0-byte file and a 0-byte directory ('0' vs '---'), 
and '-1' is used as the size value representing directory, so it is reasonable
to keep use '-1' as a size for directory.

+    modificationTime: new Date(data.lastModifiedTime)
+  };
+
   if (!data.isPresent) {
     // Block the local fetch for drive files, which require downloading.
     result.thumbnail = {url: '', transform: null};
     result.media = {};
   }
 
   if ('thumbnailUrl' in data) {
     result.thumbnail = {
       url: data.thumbnailUrl,
       transform: null
@@ skipping 192 matching lines @@
 
 /**
  * Handles the 'log' message from the worker.
  * @param {Array.<*>} arglist Log arguments.
  * @private
  */
 ContentProvider.prototype.onLog_ = function(arglist) {
   if (MetadataCache.log)  // Avoid log spam by default.
     console.log.apply(console, ['metadata:'].concat(arglist));
 };