Files.app: Fixed a bug of moving multiple files.

In the situation that both a directory and its child item are moved, if the
directory is moved first, we will lose the child item because its path is
changed.

This CL make the copy items sorted so as that items in the deeper directories
moved faster than ones in the shallower directories.

BUG=230755
TEST=Enable moving from search results and test manually

Review URL: https://chromiumcodereview.appspot.com/15806002

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

1 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/resources/file_manager/js/file_copy_manager.js b/chrome/browser/resources/file_manager/js/file_copy_manager.js
index 5fc4f3b..b29bd49 100644
--- a/chrome/browser/resources/file_manager/js/file_copy_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_copy_manager.js
@@ -89,7 +89,9 @@ FileCopyManager.Task.prototype.setEntries = function(entries, callback) {
   var self = this;
 
   var onEntriesRecursed = function(result) {
-    self.pendingDirectories = result.dirEntries;
+    // Deeper directory is moved earier.
+    self.pendingDirectories = result.dirEntries.sort(
+        function(a, b) { return a.fullPath < b.fullPath; });
     self.pendingFiles = result.fileEntries;
     self.pendingBytes = result.fileBytes;
     callback();
@@ -109,16 +111,14 @@ FileCopyManager.Task.prototype.getNextEntry = function() {
   // We should keep the file in pending list and remove it after complete.
   // Otherwise, if we try to get status in the middle of copying. The returned
   // status is wrong (miss count the pasting item in totalItems).
-  if (this.pendingDirectories.length) {
-    this.pendingDirectories[0].inProgress = true;
-    return this.pendingDirectories[0];
-  }
-
   if (this.pendingFiles.length) {
     this.pendingFiles[0].inProgress = true;
     return this.pendingFiles[0];
   }
-
+  if (this.pendingDirectories.length) {
+    this.pendingDirectories[0].inProgress = true;
+    return this.pendingDirectories[0];
+  }
   return null;
 };