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

Unified Diff: ui/file_manager/file_manager/foreground/js/file_manager.js

Issue 571343002: Add notification before getMultiProfileShareEntries_. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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: ui/file_manager/file_manager/foreground/js/file_manager.js
diff --git a/ui/file_manager/file_manager/foreground/js/file_manager.js b/ui/file_manager/file_manager/foreground/js/file_manager.js
index 82ffcf3c1ff9c7c54942c37db64aff26238b9834..7d7ff35e62bf5652cac95d0a56a96426189e2547 100644
--- a/ui/file_manager/file_manager/foreground/js/file_manager.js
+++ b/ui/file_manager/file_manager/foreground/js/file_manager.js
@@ -947,12 +947,14 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
'entries-changed', this.onEntriesChangedBound_);
var controller = this.fileTransferController_ =
- new FileTransferController(this.document_,
- this.fileOperationManager_,
- this.metadataCache_,
- this.directoryModel_,
- this.volumeManager_,
- this.ui_.multiProfileShareDialog);
+ new FileTransferController(
+ this.document_,
+ this.fileOperationManager_,
+ this.metadataCache_,
+ this.directoryModel_,
+ this.volumeManager_,
+ this.ui_.multiProfileShareDialog,
+ this.backgroundPage_.background.progressCenter);
controller.attachDragSource(this.table_.list);
controller.attachFileListDropTarget(this.table_.list);
controller.attachDragSource(this.grid_);
@@ -2817,9 +2819,20 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
this.directoryModel_.dispose();
if (this.volumeManager_)
this.volumeManager_.dispose();
- if (this.progressCenterPanel_)
+ for (var i = 0;
+ i < this.fileTransferController_.pendingTaskId.length;
+ i++) {
+ var taskId = this.fileTransferController_.pendingTaskId[i];
+ var item =
+ this.backgroundPage_.background.progressCenter.getItemById(taskId);
+ item.message = '';
+ item.state = ProgressItemState.CANCELED;
+ this.backgroundPage_.background.progressCenter.updateItem(item);
+ }
+ if (this.progressCenterPanel_) {
this.backgroundPage_.background.progressCenter.removePanel(
this.progressCenterPanel_);
+ }
if (this.fileOperationManager_) {
if (this.onCopyProgressBound_) {
this.fileOperationManager_.removeEventListener(

Powered by Google App Engine
This is Rietveld 408576698