Skip to content

Commit

Permalink
[M110] [FilesTrash] Ensure the delete button is reset after permanent…
Browse files Browse the repository at this point in the history
… delete

If you delete a file on a trash enabled volume, then go to a non trash
enabled volume and delete the dialog button stays with the wording
"Delete forever". This resets the button text every time.

(cherry picked from commit d838178)

Bug: b:265353795
Change-Id: Ib79503af692a45780143af6c3dd84316aa4c9fd8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4177713
Commit-Queue: Ben Reich <benreich@chromium.org>
Reviewed-by: Joel Hockey <joelhockey@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1094233}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4199295
Cr-Commit-Position: refs/branch-heads/5481@{#705}
Cr-Branched-From: 130f3e4-refs/heads/main@{#1084008}
  • Loading branch information
ben-reich authored and Chromium LUCI CQ committed Jan 27, 2023
1 parent 0cedccb commit 62c9446
Showing 1 changed file with 1 addition and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1255,6 +1255,7 @@ CommandHandler.deleteCommand_ = new (class extends FilesCommand {
const deleteMessage = entries.length === 1 ?
strf('CONFIRM_DELETE_ONE', entries[0].name) :
strf('CONFIRM_DELETE_SOME', entries.length);
dialog.setOkLabel(str('DELETE_BUTTON_LABEL'));
dialog.show(deleteMessage, deleteAction, cancelAction, null);
}

Expand Down

0 comments on commit 62c9446

Please sign in to comment.