ui/file_manager/file_manager/foreground/js/thumbnail_loader.js - Issue 574293002: Files.app: Show thumbnail of non-image file even when the file cache is present

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/file_manager/file_manager/foreground/js/thumbnail_loader.js

Issue 574293002: Files.app: Show thumbnail of non-image file even when the file cache is present (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix null-pointer exception Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« ui/file_manager/file_manager/foreground/js/metadata/metadata_cache.js ('K') | « ui/file_manager/file_manager/foreground/js/metadata/metadata_cache.js ('k') | ui/file_manager/video_player/js/video_player.js » ('j') | ui/file_manager/video_player/js/video_player.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/file_manager/file_manager/foreground/js/thumbnail_loader.js

diff --git a/ui/file_manager/file_manager/foreground/js/thumbnail_loader.js b/ui/file_manager/file_manager/foreground/js/thumbnail_loader.js

index 3cb5491b4096803277830fdb9ccf4cb2a0695d8f..b7d82c2394e8db9b304534aafe98d90c6432d2a7 100644

--- a/ui/file_manager/file_manager/foreground/js/thumbnail_loader.js

+++ b/ui/file_manager/file_manager/foreground/js/thumbnail_loader.js

@@ -50,11 +50,14 @@ function ThumbnailLoader(entry, opt_loaderType, opt_metadata, opt_mediaType,

};

}

- if (opt_metadata.thumbnail && opt_metadata.thumbnail.url &&

+ if (((opt_metadata.thumbnail && opt_metadata.thumbnail.url) ||

+ (opt_metadata.external && opt_metadata.external.thumbnailUrl)) &&

opt_useEmbedded === ThumbnailLoader.UseEmbedded.USE_EMBEDDED) {

- this.thumbnailUrl_ = opt_metadata.thumbnail.url;

+ this.thumbnailUrl_ =

+ (opt_metadata.thumbnail && opt_metadata.thumbnail.url) ||

+ (opt_metadata.external && opt_metadata.external.thumbnailUrl);

this.transform_ = externalTransform !== undefined ? externalTransform :

- opt_metadata.thumbnail.transform;

+ (opt_metadata.thumbnail && opt_metadata.thumbnail.transform);

} else if (FileType.isImage(entry)) {

this.thumbnailUrl_ = entry.toURL();

this.transform_ = externalTransform !== undefined ? externalTransform :