chrome/browser/resources/file_manager/js/image_editor/image_view.js - Issue 10006013: [NOT FOR COMMIT] Use chrome://gdata in Photo Editor

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: chrome/browser/resources/file_manager/js/image_editor/image_view.js

Issue 10006013: [NOT FOR COMMIT] Use chrome://gdata in Photo Editor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 8 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 | « chrome/browser/chromeos/extensions/file_browser_private_api.cc ('k') | chrome/browser/resources/file_manager/js/metadata/metadata_provider.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/file_manager/js/image_editor/image_view.js

diff --git a/chrome/browser/resources/file_manager/js/image_editor/image_view.js b/chrome/browser/resources/file_manager/js/image_editor/image_view.js

index c2ad3872394c72ffc332c4477ba55acc80f39d5f..a1d543b0d35f3d35e7999ffb0beba436c1c5e5ae 100644

--- a/chrome/browser/resources/file_manager/js/image_editor/image_view.js

+++ b/chrome/browser/resources/file_manager/js/image_editor/image_view.js

@@ -269,6 +269,7 @@ ImageView.prototype.load = function(

}

function loadMainImage(loadType, slide, contentURL, previewShown, delay) {

+ contentURL = metadata.cachedURL || contentURL;

if (self.prefetchLoader_.isLoading(contentURL)) {

// The image we need is already being prefetched. Initiating another load

// would be a waste. Hijack the load instead by overriding the callback.

@@ -353,7 +354,7 @@ ImageView.prototype.prefetch = function(id, source, metadata) {

this.contentCache_.evictLRU();

this.prefetchLoader_.load(

- source,

+ metadata.cachedURL || source,

this.localImageTransformFetcher_,

prefetchDone,

ImageView.ANIMATION_WAIT_INTERVAL);