summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/resources/file_manager/css/file_manager.css2
-rw-r--r--chrome/browser/resources/file_manager/js/file_grid.js6
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/resources/file_manager/css/file_manager.css b/chrome/browser/resources/file_manager/css/file_manager.css
index 201e8c7..21ba6ce 100644
--- a/chrome/browser/resources/file_manager/css/file_manager.css
+++ b/chrome/browser/resources/file_manager/css/file_manager.css
@@ -902,7 +902,7 @@ body[type='full-page'] .detail-name .detail-icon {
}
.img-container > img:not(.cached):not(.drag-thumbnail) {
- -webkit-animation: fadeIn 500ms ease-in;
+ -webkit-animation: fadeIn 250ms linear;
}
.thumbnail-bottom {
diff --git a/chrome/browser/resources/file_manager/js/file_grid.js b/chrome/browser/resources/file_manager/js/file_grid.js
index afe0c50..281c466 100644
--- a/chrome/browser/resources/file_manager/js/file_grid.js
+++ b/chrome/browser/resources/file_manager/js/file_grid.js
@@ -144,8 +144,10 @@ FileGrid.decorateThumbnailBox = function(
new ThumbnailLoader(imageUrl,
ThumbnailLoader.LoaderType.IMAGE,
metadata,
- undefined,
- ThumbnailLoader.UseEmbedded.NO_EMBEDDED).
+ undefined, // opt_mediaType
+ FileType.isOnDrive(imageUrl) ?
+ ThumbnailLoader.UseEmbedded.USE_EMBEDDED :
+ ThumbnailLoader.UseEmbedded.NO_EMBEDDED).
load(box,
fillMode,
ThumbnailLoader.OptimizationMode.DISCARD_DETACHED,