Change butter bar message depending on the type of operation and the number of files.

chrome/browser/resources/file_manager/js/file_copy_manager.js

Index: chrome/browser/resources/file_manager/js/file_copy_manager.js
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 cd167ca92834254883d29a46b787dd80a7fd4814..8901a22381f01ab0a3f9a7cb4edc71c8d805c088 100644
--- a/chrome/browser/resources/file_manager/js/file_copy_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_copy_manager.js
@@ -208,17 +208,39 @@ FileCopyManager.prototype.getStatus = function() {
     completedFiles: 0,
     completedDirectories: 0,
     completedBytes: 0,
+
+    percentage: NaN,
+    pendingCopies: 0,
+    pendingMoves: 0,
+    filename: ''  // In case pendingItems == 1
   };
 
+  var pendingFile = null;
+
   for (var i = 0; i < this.copyTasks_.length; i++) {
     var task = this.copyTasks_[i];
-    rv.pendingFiles += task.pendingFiles.length;
-    rv.pendingDirectories += task.pendingDirectories.length;
+    var pendingFiles = task.pendingFiles.length;
+    var pendingDirectories = task.pendingDirectories.length;
+    rv.pendingFiles += pendingFiles;
+    rv.pendingDirectories += pendingDirectories;
     rv.pendingBytes += task.pendingBytes;
 
     rv.completedFiles += task.completedFiles.length;
     rv.completedDirectories += task.completedDirectories.length;
     rv.completedBytes += task.completedBytes;
+
+    if (task.move || task.deleteAfterCopy) {
+      rv.pendingMoves += pendingFiles + pendingDirectories;
+    } else {
+      rv.pendingCopies += pendingFiles + pendingDirectories;
+    }
+
+    if (task.pendingFiles.length === 1)
+      pendingFile = task.pendingFiles[0];
+
+    if (task.pendingDirectories.length === 1)
+      pendingFile = task.pendingDirectories[0];
+

[Vladislav Kaznacheev, 2012/08/03 14:50:10]

This code will not work properly if you have some pending files and 1 pending
directory

[Oleg Eterevsky, 2012/08/03 14:53:01]

This code is supposed to work only in case there remains exactly 1 item left.
Otherwise the line 255 will not be executed and rv.filename will be == ''.

   }
   rv.pendingItems = rv.pendingFiles + rv.pendingDirectories;
   rv.completedItems = rv.completedFiles + rv.completedDirectories;
@@ -228,24 +250,11 @@ FileCopyManager.prototype.getStatus = function() {
   rv.totalItems = rv.pendingItems + rv.completedItems;
   rv.totalBytes = rv.pendingBytes + rv.completedBytes;
 
-  return rv;
-};
-
-/**
- * Get the overall progress data of all queued copy tasks.
- * @return {Object} An object containing the following parameters:
- *    percentage - The percentage (0-1) of finished items.
- *    pendingItems - The number of pending/unfinished items.
- */
-FileCopyManager.prototype.getProgress = function() {
-  var status = this.getStatus();
-
-  var percentage = status.completedBytes / status.totalBytes;
+  rv.percentage = rv.completedBytes / rv.totalBytes;
+  if (rv.pendingItems === 1)
+    rv.filename = pendingFile.name;
 
-  return {
-    percentage: percentage,
-    pendingItems: status.pendingItems
-  };
+  return rv;
 };
 
 /**