Chromium Code Reviews| Index: chrome/browser/resources/file_manager/foreground/js/file_tasks.js |
| diff --git a/chrome/browser/resources/file_manager/foreground/js/file_tasks.js b/chrome/browser/resources/file_manager/foreground/js/file_tasks.js |
| index d7603d44f0e6d390255ce69c936d9513634feeef..a9ba10909de88affce7e993143b724dd4c74f398 100644 |
| --- a/chrome/browser/resources/file_manager/foreground/js/file_tasks.js |
| +++ b/chrome/browser/resources/file_manager/foreground/js/file_tasks.js |
| @@ -574,7 +574,7 @@ FileTasks.prototype.mountArchivesInternal_ = function(entries) { |
| fm.resolveSelectResults_(urls, function(resolvedURLs) { |
| for (var index = 0; index < resolvedURLs.length; ++index) { |
| // TODO(mtomasz): Pass Entry instead of URL. |
| - fm.volumeManager_.mountArchive(resolvedURLs[index], |
| + fm.volumeManager.mountArchive(resolvedURLs[index], |
| function(mountPath) { |
| tracker.stop(); |
| if (!tracker.hasChanged) |
| @@ -629,9 +629,8 @@ FileTasks.prototype.openGalleryInternal_ = function(entries) { |
| // changes in the Gallery and popped when the Gallery is closed. |
| util.updateAppState(); |
| - // TODO(mtomasz): Pass entries instead of urls. |
| - var onBack = function(selectedUrls) { |
| - fm.directoryModel_.selectUrls(selectedUrls); |
| + var onBack = function(selectedEntries) { |
| + fm.directoryModel_.selectEntries(selectedEntries); |
|
hirono
2013/12/10 08:49:31
We cab also use directoryModel accessor.
mtomasz
2013/12/11 05:30:25
Done.
|
| fm.closeFilePopup(); // Will call Gallery.unload. |
| window.appState = savedAppState; |
| util.saveAppState(); |
| @@ -659,7 +658,7 @@ FileTasks.prototype.openGalleryInternal_ = function(entries) { |
| var readonly = fm.isOnReadonlyDirectory(); |
| var currentDir = fm.getCurrentDirectoryEntry(); |
| var downloadsVolume = |
| - fm.volumeManager_.getCurrentProfileVolumeInfo(RootType.DOWNLOADS); |
| + fm.volumeManager.getCurrentProfileVolumeInfo(RootType.DOWNLOADS); |
| var downloadsDir = downloadsVolume && downloadsVolume.root; |
| var readonlyDirName = null; |
| if (readonly && currentDir) { |
| @@ -684,11 +683,8 @@ FileTasks.prototype.openGalleryInternal_ = function(entries) { |
| onAppRegionChanged: onAppRegionChanged, |
| displayStringFunction: strf |
| }; |
| - // TODO(mtomasz): Pass entries instead. |
| - var allUrls = util.entriesToURLs(allEntries); |
| - var urls = util.entriesToURLs(entries); |
| galleryFrame.contentWindow.Gallery.open( |
| - context, fm.volumeManager_, allUrls, urls); |
| + context, fm.volumeManager, allEntries, entries); |
| }.bind(this); |
| galleryFrame.src = 'gallery.html'; |