Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Unified Diff: ui/file_manager/gallery/js/image_editor/image_view.js

Issue 529413002: Rename DriveProvider to ExternalProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed. 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
« no previous file with comments | « ui/file_manager/gallery/js/gallery_item.js ('k') | ui/file_manager/gallery/js/mosaic_mode.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/file_manager/gallery/js/image_editor/image_view.js
diff --git a/ui/file_manager/gallery/js/image_editor/image_view.js b/ui/file_manager/gallery/js/image_editor/image_view.js
index e0d6a20270ceb26d5c89cd9aa80e583cc83545eb..a96dd0b5a3992db857278e6d58cfb4bc3b2a41df 100644
--- a/ui/file_manager/gallery/js/image_editor/image_view.js
+++ b/ui/file_manager/gallery/js/image_editor/image_view.js
@@ -284,9 +284,9 @@ ImageView.prototype.load =
} else {
var cachedScreen = item.screenImage;
var imageWidth = metadata.media && metadata.media.width ||
- metadata.drive && metadata.drive.imageWidth;
+ metadata.external && metadata.external.imageWidth;
var imageHeight = metadata.media && metadata.media.height ||
- metadata.drive && metadata.drive.imageHeight;
+ metadata.external && metadata.external.imageHeight;
if (cachedScreen) {
// We have a cached screen-scale canvas, use it instead of a thumbnail.
displayThumbnail(ImageView.LOAD_TYPE_CACHED_SCREEN, cachedScreen);
@@ -319,12 +319,12 @@ ImageView.prototype.load =
width = metadata.media.width;
height = metadata.media.height;
}
- // If metadata.drive.present is true, the image data is loaded directly
+ // If metadata.external.present is true, the image data is loaded directly
// from local cache, whose size may be out of sync with the drive
// metadata.
- if (metadata.drive && !metadata.drive.present) {
- width = metadata.drive.imageWidth;
- height = metadata.drive.imageHeight;
+ if (metadata.external && !metadata.external.present) {
+ width = metadata.external.imageWidth;
+ height = metadata.external.imageHeight;
}
self.replace(
canvas,
@@ -381,7 +381,7 @@ ImageView.prototype.load =
loadType, ImageView.LOAD_TYPE_TOTAL);
if (loadType === ImageView.LOAD_TYPE_ERROR &&
- !navigator.onLine && !metadata.drive.present) {
+ !navigator.onLine && !metadata.external.present) {
loadType = ImageView.LOAD_TYPE_OFFLINE;
}
if (loadCallback) loadCallback(loadType, animationDuration, opt_error);
« no previous file with comments | « ui/file_manager/gallery/js/gallery_item.js ('k') | ui/file_manager/gallery/js/mosaic_mode.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698