Migrate from URLs to Entries in the Files App's gallery.

chrome/browser/resources/file_manager/foreground/js/photo/slide_mode.js

Index: chrome/browser/resources/file_manager/foreground/js/photo/slide_mode.js
diff --git a/chrome/browser/resources/file_manager/foreground/js/photo/slide_mode.js b/chrome/browser/resources/file_manager/foreground/js/photo/slide_mode.js
index 2d0adcbac3b53ba064b7ce051747eae15b9a58e2..6d69f3f208d110bdf289454d85e851f4a2abd1b3 100644
--- a/chrome/browser/resources/file_manager/foreground/js/photo/slide_mode.js
+++ b/chrome/browser/resources/file_manager/foreground/js/photo/slide_mode.js
@@ -288,12 +288,11 @@ SlideMode.prototype.enter = function(
     this.displayedIndex_ = this.getSelectedIndex();
 
     var selectedItem = this.getSelectedItem();
-    var selectedUrl = selectedItem.getUrl();
     // Show the selected item ASAP, then complete the initialization
     // (loading the ribbon thumbnails can take some time).
-    this.metadataCache_.get(selectedUrl, Gallery.METADATA_TYPE,
+    this.metadataCache_.get(selectedItem.getEntry(), Gallery.METADATA_TYPE,
         function(metadata) {
-          this.loadItem_(selectedUrl, metadata,
+          this.loadItem_(selectedItem.getEntry(), metadata,
               zoomFromRect && this.imageView_.createZoomEffect(zoomFromRect),
               displayCallback, loadDone);
         }.bind(this));
@@ -477,7 +476,7 @@ SlideMode.prototype.loadSelectedItem_ = function() {
   if (this.sequenceLength_ <= 1) {
     // We have just broke the sequence. Touch the current image so that it stays
     // in the cache longer.
-    this.imageView_.prefetch(this.imageView_.contentID_);
+    this.imageView_.prefetch(this.imageView_.contentEntry_);
   }
 
   this.displayedIndex_ = index;
@@ -506,7 +505,7 @@ SlideMode.prototype.loadSelectedItem_ = function() {
   var onMetadata = function(metadata) {
     // Discard, since another load has been invoked after this one.
     if (selectedUniqueKey != this.currentUniqueKey_) return;
-    this.loadItem_(selectedItem.getUrl(), metadata,
+    this.loadItem_(selectedItem.getEntry(), metadata,
         new ImageView.Effect.Slide(step, this.isSlideshowPlaying_()),
         function() {} /* no displayCallback */,
         function(loadType, delay) {
@@ -520,7 +519,7 @@ SlideMode.prototype.loadSelectedItem_ = function() {
         }.bind(this));
   }.bind(this);
   this.metadataCache_.get(
-      selectedItem.getUrl(), Gallery.METADATA_TYPE, onMetadata);
+      selectedItem.getEntry(), Gallery.METADATA_TYPE, onMetadata);
 };
 
 /**
@@ -646,7 +645,7 @@ SlideMode.prototype.selectLast = function() {
 /**
  * Load and display an item.
  *
- * @param {string} url Item url.
+ * @param {FileEntry} entry Item entry to be loaded.
  * @param {Object} metadata Item metadata.
  * @param {Object} effect Transition effect object.
  * @param {function} displayCallback Called when the image is displayed
@@ -655,7 +654,7 @@ SlideMode.prototype.selectLast = function() {
  * @private
  */
 SlideMode.prototype.loadItem_ = function(
-    url, metadata, effect, displayCallback, loadCallback) {
+    entry, metadata, effect, displayCallback, loadCallback) {
   this.selectedImageMetadata_ = MetadataCache.cloneMetadata(metadata);
 
   this.showSpinner_(true);
@@ -699,8 +698,9 @@ SlideMode.prototype.loadItem_ = function(
       ImageUtil.metrics.recordSmallCount(ImageUtil.getMetricName('Size.MPix'),
           toMillions(canvas.width * canvas.height));
 
-      var extIndex = url.lastIndexOf('.');
-      var ext = extIndex < 0 ? '' : url.substr(extIndex + 1).toLowerCase();
+      var extIndex = entry.name.lastIndexOf('.');
+      var ext = extIndex < 0 ? '' :
+          entry.name.substr(extIndex + 1).toLowerCase();
       if (ext == 'jpeg') ext = 'jpg';
       ImageUtil.metrics.recordEnum(
           ImageUtil.getMetricName('FileType'), ext, ImageUtil.FILE_TYPES);
@@ -739,7 +739,7 @@ SlideMode.prototype.loadItem_ = function(
     displayCallback();
   }.bind(this);
 
-  this.editor_.openSession(url, metadata, effect,
+  this.editor_.openSession(entry, metadata, effect,
       this.saveCurrentImage_.bind(this), displayDone, loadDone);
 };
 
@@ -781,8 +781,8 @@ SlideMode.prototype.requestPrefetch = function(direction, delay) {
   if (this.getItemCount_() <= 1) return;
 
   var index = this.getNextSelectedIndex_(direction);
-  var nextItemUrl = this.getItem(index).getUrl();
-  this.imageView_.prefetch(nextItemUrl, delay);
+  var nextItemEntry = this.getItem(index).getEntry();
+  this.imageView_.prefetch(nextItemEntry, delay);
 };
 
 // Event handlers.
@@ -942,7 +942,7 @@ SlideMode.prototype.updateThumbnails = function() {
  */
 SlideMode.prototype.saveCurrentImage_ = function(callback) {
   var item = this.getSelectedItem();
-  var oldUrl = item.getUrl();
+  var oldEntry = item.getEntry();
   var canvas = this.imageView_.getCanvas();
 
   this.showSpinner_(true);
@@ -965,7 +965,7 @@ SlideMode.prototype.saveCurrentImage_ = function(callback) {
 
         var e = new Event('content');

[hirono, 2013/12/09 06:53:50]

Please replace e with event.

[mtomasz, 2013/12/10 02:37:34]

Done.

         e.item = item;
-        e.oldUrl = oldUrl;
+        e.oldEntry = oldEntry;
         e.metadata = this.selectedImageMetadata_;
         this.dataModel_.dispatchEvent(e);
 
@@ -979,9 +979,9 @@ SlideMode.prototype.saveCurrentImage_ = function(callback) {
           ImageUtil.metrics.recordUserAction(ImageUtil.getMetricName('Edit'));
         }
 
-        if (oldUrl != item.getUrl()) {
+        if (oldEntry.toURL() != item.getEntry().toURL()) {

[hirono, 2013/12/09 06:53:50]

Use util.isSameEntry.

[mtomasz, 2013/12/10 02:37:34]

Done.

           this.dataModel_.splice(
-              this.getSelectedIndex(), 0, new Gallery.Item(oldUrl));
+              this.getSelectedIndex(), 0, new Gallery.Item(oldEntry));
           // The ribbon will ignore the splice above and redraw after the
           // select call below (while being obscured by the Editor toolbar,
           // so there is no need for nice animation here).
@@ -995,17 +995,16 @@ SlideMode.prototype.saveCurrentImage_ = function(callback) {
 };
 
 /**
- * Update caches when the selected item url has changed.
- *
+ * Update caches when the selected item has been renamed.
  * @param {Event} event Event.
  * @private
  */
 SlideMode.prototype.onContentChange_ = function(event) {
-  var newUrl = event.item.getUrl();
-  if (newUrl != event.oldUrl) {
-    this.imageView_.changeUrl(newUrl);
+  var newEntry = event.item.getEntry();
+  if (newEntry.toURL() != event.oldEntry.toURL()) {

[hirono, 2013/12/09 06:53:50]

ditto.

[mtomasz, 2013/12/10 02:37:34]

Done.

+    this.imageView_.changeEntry(newEntry);
   }
-  this.metadataCache_.clear(event.oldUrl, Gallery.METADATA_TYPE);
+  this.metadataCache_.clear(event.oldEntry, Gallery.METADATA_TYPE);
 };
 
 /**