Index: ui/file_manager/file_manager/background/js/task_queue.js |
diff --git a/ui/file_manager/file_manager/background/js/task_queue.js b/ui/file_manager/file_manager/background/js/task_queue.js |
index ae0962519d7ed3a405254f268590cddb65a12e14..8629cae247d078d451b5f0b31a6c408a813ef41c 100644 |
--- a/ui/file_manager/file_manager/background/js/task_queue.js |
+++ b/ui/file_manager/file_manager/background/js/task_queue.js |
@@ -182,7 +182,7 @@ importer.TaskQueue.BaseTask = function(taskId) { |
/** @private {!Array<!importer.TaskQueue.Task.Observer>} */ |
this.observers_ = []; |
- /** @private {!importer.Resolver} */ |
+ /** @private {!importer.Resolver<!importer.TaskQueue.UpdateType>} */ |
this.finishedResolver_ = new importer.Resolver(); |
}; |
@@ -191,7 +191,8 @@ importer.TaskQueue.BaseTask.prototype = { |
/** @return {string} The task ID. */ |
get taskId() { return this.taskId_; }, |
- /** @return {!Promise} Resolves when task is complete, rejects on error. */ |
+ /** @return {!Promise<!importer.TaskQueue.UpdateType>} Resolves when task |
+ is complete, or cancelled, rejects on error. */ |
get whenFinished() { return this.finishedResolver_.promise; } |
}; |
@@ -211,9 +212,8 @@ importer.TaskQueue.BaseTask.prototype.run = function() {}; |
importer.TaskQueue.BaseTask.prototype.notify = function(updateType, opt_data) { |
switch (updateType) { |
case importer.TaskQueue.UpdateType.CANCELED: |
- case importer.TaskQueue.UpdateType.ERROR: |
case importer.TaskQueue.UpdateType.SUCCESS: |
- this.finishedResolver_.resolve(); |
+ this.finishedResolver_.resolve(updateType); |
} |
this.observers_.forEach( |