| Index: ui/file_manager/file_manager/foreground/js/metadata/metadata_cache.js
|
| diff --git a/ui/file_manager/file_manager/foreground/js/metadata/metadata_cache.js b/ui/file_manager/file_manager/foreground/js/metadata/metadata_cache.js
|
| index d3d9426570ae09264f8343ade952940bc36b80df..fe4556b19bc68bce646579ca575792d89767a8c0 100644
|
| --- a/ui/file_manager/file_manager/foreground/js/metadata/metadata_cache.js
|
| +++ b/ui/file_manager/file_manager/foreground/js/metadata/metadata_cache.js
|
| @@ -111,7 +111,8 @@ MetadataCache.DESCENDANTS = 2;
|
| MetadataCache.EVICTION_THRESHOLD_MARGIN = 500;
|
|
|
| /**
|
| - * @param {VolumeManagerWrapper} volumeManager Volume manager instance.
|
| + * @param {VolumeManagerCommon.VolumeInfoProvider} volumeManager Volume manager
|
| + * instance.
|
| * @return {MetadataCache!} The cache with all providers.
|
| */
|
| MetadataCache.createFull = function(volumeManager) {
|
| @@ -128,7 +129,7 @@ MetadataCache.createFull = function(volumeManager) {
|
| * 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.
|
| + * @return {!Object} Cloned entry.
|
| */
|
| MetadataCache.cloneMetadata = function(metadata) {
|
| if (metadata instanceof Array) {
|
| @@ -773,7 +774,8 @@ FilesystemProvider.prototype.fetch = function(
|
| * This provider returns the following objects:
|
| * external: { pinned, hosted, present, customIconUrl, etc. }
|
| * thumbnail: { url, transform }
|
| - * @param {VolumeManagerWrapper} volumeManager Volume manager instance.
|
| + * @param {VolumeManagerCommon.VolumeInfoProvider} volumeManager Volume manager
|
| + * instance.
|
| * @constructor
|
| * @extends {MetadataProvider}
|
| */
|
| @@ -781,7 +783,7 @@ function ExternalProvider(volumeManager) {
|
| MetadataProvider.call(this);
|
|
|
| /**
|
| - * @type {VolumeManagerWrapper}
|
| + * @type {VolumeManagerCommon.VolumeInfoProvider}
|
| * @private
|
| */
|
| this.volumeManager_ = volumeManager;
|
| @@ -803,11 +805,11 @@ ExternalProvider.prototype = {
|
| * @return {boolean} Whether this provider supports the entry.
|
| */
|
| ExternalProvider.prototype.supportsEntry = function(entry) {
|
| - var locationInfo = this.volumeManager_.getLocationInfo(entry);
|
| - if (!locationInfo)
|
| + var volumeInfo = this.volumeManager_.getVolumeInfo(entry);
|
| + if (!volumeInfo)
|
| return false;
|
| - return locationInfo.isDriveBased ||
|
| - locationInfo.rootType === VolumeManagerCommon.RootType.PROVIDED;
|
| + return volumeInfo.volumeType === VolumeManagerCommon.VolumeType.DRIVE ||
|
| + volumeInfo.volumeType === VolumeManagerCommon.VolumeType.PROVIDED;
|
| };
|
|
|
| /**
|
| @@ -954,7 +956,6 @@ function ContentProvider() {
|
| /**
|
| * Path of a worker script.
|
| * @type {string}
|
| - * @const
|
| */
|
| ContentProvider.WORKER_SCRIPT =
|
| 'chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/' +
|
|
|