Fixed the prefetch in the Photo Editor

BUG=chromium-os:24586
TEST=

Review URL: http://codereview.chromium.org/9006050

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115885 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 5 insertions, 6 deletions

diff --git a/chrome/browser/resources/file_manager/js/image_editor/gallery.js b/chrome/browser/resources/file_manager/js/image_editor/gallery.js
index a2c0fa4..46ad5f8 100644
--- a/chrome/browser/resources/file_manager/js/image_editor/gallery.js
+++ b/chrome/browser/resources/file_manager/js/image_editor/gallery.js
@@ -382,7 +382,7 @@ Gallery.prototype.openImage = function(id, content, metadata, slide, callback) {
   }
 
   var self = this;
-  function loadDone() {
+  function loadDone(loadType) {
     ImageUtil.metrics.recordUserAction(ImageUtil.getMetricName('View'));
 
     function toMillions(number) { return Math.round(number / (1000 * 1000)) }
@@ -401,7 +401,7 @@ Gallery.prototype.openImage = function(id, content, metadata, slide, callback) {
     ImageUtil.metrics.recordEnum(
         ImageUtil.getMetricName('FileType'), ext, ImageUtil.FILE_TYPES);
 
-    callback(arguments);
+    callback(loadType);
   }
 
   this.editor_.openSession(id, content, metadata, slide, loadDone);
diff --git a/chrome/browser/resources/file_manager/js/image_editor/image_editor.js b/chrome/browser/resources/file_manager/js/image_editor/image_editor.js
index 1b06471..6115a36 100644
--- a/chrome/browser/resources/file_manager/js/image_editor/image_editor.js
+++ b/chrome/browser/resources/file_manager/js/image_editor/image_editor.js
@@ -93,14 +93,14 @@ ImageEditor.prototype.openSession = function(
   this.lockUI(true);
 
   var self = this;
-  this.imageView_.load(id, source, metadata, slide, function() {
+  this.imageView_.load(id, source, metadata, slide, function(loadType) {
     self.lockUI(false);
     self.commandQueue_ = new CommandQueue(
         self.container_.ownerDocument, self.imageView_.getCanvas());
     self.commandQueue_.attachUI(
         self.getImageView(), self.getPrompt(), self.lockUI.bind(self));
     self.updateUndoRedo();
-    if (opt_callback) opt_callback(arguments);
+    if (opt_callback) opt_callback(loadType);
   });
 };
 
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 311f185..c348750 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
@@ -150,8 +150,7 @@ ImageView.prototype.cancelLoad = function() {
  * @param {string|HTMLCanvasElement} source
  * @param {Object} metadata
  * @param {Object} slide Slide-in animation direction.
- * @param {function(boolean} opt_callback The parameter is true if the image
- *    was loaded instantly (from the cache of the canvas source).
+ * @param {function(number} opt_callback The parameter is the load type.
  */
 ImageView.prototype.load = function(
     id, source, metadata, slide, opt_callback) {