Improve TrashEntry closure annotations

Since TrashEntry is now in common, we can remove other declarations of
TrashEntry.  Externs can use FilesAppEntry, all others can use
TrashEntry directly.

Bug: 953310
Change-Id: I4a8f6904152daecf917975caa3abff14b92e189a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2573396Reviewed-by: Noel Gordon <noel@chromium.org>
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833506}

ui/file_manager/externs/background/file_operation_manager.js

@@ -68,10 +68,9 @@ class FileOperationManager extends EventTarget {
   /**
    * Restores files from trash.
    *
-   * @param {Array<!{name: string, filesEntry: !Entry, infoEntry: !FileEntry}>}
-   *     trashEntries The trash entries.
+   * @param {Array<!FilesAppEntry>} entries The trash entries.
    */
-  restoreDeleted(trashEntries) {}
+  restoreDeleted(entries) {}
 
   /**
    * Creates a zip file for the selection of files.

ui/file_manager/externs/file_operation_progress_event.js

@@ -25,7 +25,7 @@ class FileOperationProgressEvent extends Event {
     /** @public {number} */
     this.processedBytes;
 
-    /** @public {?Array<!fileOperationUtil.TrashEntry>} */
+    /** @public {?Array<!FilesAppEntry>} */
     this.trashedEntries;
   }
 }

ui/file_manager/externs/file_operation_util.js

@@ -12,12 +12,3 @@ fileOperationUtil.EventRouter = function() {};
 
 /** @enum {string} */
 fileOperationUtil.EventRouter.EventType = {};
-
-/**
- * @typedef {{
- *  name: string,
- *  filesEntry: !Entry,
- *  infoEntry: !FileEntry
- * }}
- */
-fileOperationUtil.TrashEntry;

ui/file_manager/file_manager/background/js/BUILD.gn

@@ -383,6 +383,7 @@ js_library("file_operation_util") {
   deps = [
     ":metadata_proxy",
     "//ui/file_manager/file_manager/common/js:async_util",
+    "//ui/file_manager/file_manager/common/js:trash",
     "//ui/file_manager/file_manager/common/js:util",
   ]
   externs_list =

ui/file_manager/file_manager/background/js/file_operation_manager.js

@@ -531,23 +531,19 @@ class FileOperationManagerImpl {
   /**
    * Restores files from trash.
    *
-   * @param {Array<!fileOperationUtil.TrashEntry>} trashEntries The trash
-   *     entries.
+   * @param {Array<!TrashEntry>} entries The trash entries.
    */
-  restoreDeleted(trashEntries) {
+  restoreDeleted(entries) {
     if (!this.volumeManager_) {
       volumeManagerFactory.getInstance().then(volumeManager => {
         this.volumeManager_ = volumeManager;
-        this.restoreDeleted(trashEntries);
+        this.restoreDeleted(entries);
       });
       return;
     }
 
-    while (trashEntries.length) {
-      this.trash_
-          .restore(
-              assert(this.volumeManager_),
-              /** @type {!TrashEntry} */ (trashEntries.pop()))
+    while (entries.length) {
+      this.trash_.restore(assert(this.volumeManager_), entries.pop())
           .catch(e => console.error('Error restoring deleted file', e));
     }
   }

ui/file_manager/file_manager/background/js/file_operation_util.js

@@ -1245,15 +1245,6 @@ fileOperationUtil.ZipTask = class extends fileOperationUtil.Task {
   }
 };
 
-/**
- * @typedef {{
- *  name: string,
- *  filesEntry: !Entry,
- *  infoEntry: !FileEntry
- * }}
- */
-fileOperationUtil.TrashEntry;
-
 /**
  * @typedef {{
  *  entries: Array<Entry>,
@@ -1262,7 +1253,7 @@ fileOperationUtil.TrashEntry;
  *  totalBytes: number,
  *  processedBytes: number,
  *  cancelRequested: boolean,
- *  trashedEntries: Array<!fileOperationUtil.TrashEntry>,
+ *  trashedEntries: Array<!TrashEntry>,
  * }}
  */
 fileOperationUtil.DeleteTask;