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

Unified Diff: chrome/browser/resources/file_manager/foreground/js/photo/gallery.js

Issue 132453007: Migrate fullPaths to URLs in appState. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 6 years, 11 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
Index: chrome/browser/resources/file_manager/foreground/js/photo/gallery.js
diff --git a/chrome/browser/resources/file_manager/foreground/js/photo/gallery.js b/chrome/browser/resources/file_manager/foreground/js/photo/gallery.js
index 8b3ae3f11f33c6b4eb8740145aac7c2aeb77913f..1cc791864df1566741ad6ce04fab314c8bc87664 100644
--- a/chrome/browser/resources/file_manager/foreground/js/photo/gallery.js
+++ b/chrome/browser/resources/file_manager/foreground/js/photo/gallery.js
@@ -499,7 +499,7 @@ Gallery.prototype.delete_ = function() {
// TODO(hirono): Use fileOperationManager.
var entry = itemsToRemove.pop().getEntry();
entry.remove(deleteNext, function() {
- util.flog('Error deleting: ' + entry.fullPath, deleteNext);
+ util.flog('Error deleting: ' + entry.name, deleteNext);
});
}
@@ -637,22 +637,18 @@ Gallery.prototype.onKeyDown_ = function(event) {
* @private
*/
Gallery.prototype.updateSelectionAndState_ = function() {
- var path;
var displayName = '';
- // TODO(mtomasz): Migrate fullPath to toURL().
var selectedItems = this.getSelectedItems();
if (selectedItems.length === 1) {
var item = selectedItems[0];
var entry = item.getEntry();
- path = entry.fullPath;
window.top.document.title = entry.name;
displayName = ImageUtil.getDisplayNameFromName(entry.name);
} else if (selectedItems.length > 1 && this.context_.curDirEntry) {
// If the Gallery was opened on search results the search query will not be
// recorded in the app state and the relaunch will just open the gallery
// in the curDirEntry directory.
- path = this.context_.curDirEntry.fullPath;
window.top.document.title = this.context_.curDirEntry.name;
displayName =
this.displayStringFunction_('GALLERY_ITEMS_SELECTED',
@@ -661,7 +657,7 @@ Gallery.prototype.updateSelectionAndState_ = function() {
window.top.util.updateAppState(
null, // Keep the current directory.
- path, // Update the selection.
+ entry.toURL(), // Update the selection.
{gallery: (this.currentMode_ === this.mosaicMode_ ? 'mosaic' : 'slide')});
// We can't rename files in readonly directory.
@@ -671,7 +667,6 @@ Gallery.prototype.updateSelectionAndState_ = function() {
this.filenameEdit_.value = displayName;
- // Resolve real filesystem path of the current file.
if (this.selectionModel_.selectedIndexes.length) {
var selectedIndex = this.selectionModel_.selectedIndex;
var selectedItem =

Powered by Google App Engine
This is Rietveld 408576698