diff options
| author | ryoh <ryoh@chromium.org> | 2016-02-17 00:49:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-17 08:50:30 +0000 |
| commit | 0885c382d94755b863ab122db1dc0c4bc6b808ec (patch) | |
| tree | 70de08e8e41d5e6bb5911557cb87c46ce93fc149 /ui/file_manager | |
| parent | 024e60cb3a3f8ed8079b204b68b313ded65b5f12 (diff) | |
| download | chromium_src-0885c382d94755b863ab122db1dc0c4bc6b808ec.zip chromium_src-0885c382d94755b863ab122db1dc0c4bc6b808ec.tar.gz chromium_src-0885c382d94755b863ab122db1dc0c4bc6b808ec.tar.bz2 | |
Check chrome.runtime.lastError after resolving Metadata.
BUG=587360
TEST=manually, with corrupted media file.
Review URL: https://codereview.chromium.org/1704623003
Cr-Commit-Position: refs/heads/master@{#375830}
Diffstat (limited to 'ui/file_manager')
| -rw-r--r-- | ui/file_manager/file_manager/foreground/js/metadata/content_metadata_provider.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ui/file_manager/file_manager/foreground/js/metadata/content_metadata_provider.js b/ui/file_manager/file_manager/foreground/js/metadata/content_metadata_provider.js index 9c0a5b4..9cbea55 100644 --- a/ui/file_manager/file_manager/foreground/js/metadata/content_metadata_provider.js +++ b/ui/file_manager/file_manager/foreground/js/metadata/content_metadata_provider.js @@ -168,8 +168,14 @@ ContentMetadataProvider.prototype.getFromMediaGalleries_ = } chrome.mediaGalleries.getMetadata(blob, {metadataType: metadataType}, function(metadata) { - self.convertMediaMetadataToMetadataItem_(entry, metadata) - .then(resolve, reject); + if (chrome.runtime.lastError) { + resolve(self.createError_(entry.toURL(), + 'resolving metadata', + chrome.runtime.lastError.toString())); + } else { + self.convertMediaMetadataToMetadataItem_(entry, metadata) + .then(resolve, reject); + } }); }, function(err) { resolve(self.createError_(entry.toURL(), |