mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
fix: make shell.moveItemToTrash return false on Windows when move is unsuccessful (#25170)
* test: add tests for shell.moveItemToTrash (#25113) * fix: make shell.moveItemToTrash return false on Windows when move unsuccessful (#25124) Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
#include "base/nix/xdg_util.h"
|
||||
#include "base/process/kill.h"
|
||||
#include "base/process/launch.h"
|
||||
#include "base/threading/thread_restrictions.h"
|
||||
#include "ui/gtk/gtk_util.h"
|
||||
#include "url/gurl.h"
|
||||
|
||||
@@ -51,6 +52,8 @@ bool XDGUtil(const std::vector<std::string>& argv,
|
||||
return false;
|
||||
|
||||
if (wait_for_exit) {
|
||||
base::ScopedAllowBaseSyncPrimitivesForTesting
|
||||
allow_sync; // required by WaitForExit
|
||||
int exit_code = -1;
|
||||
bool success = process.WaitForExit(&exit_code);
|
||||
if (!callback.is_null())
|
||||
|
||||
@@ -387,10 +387,14 @@ bool MoveItemToTrash(const base::FilePath& path, bool delete_on_fail) {
|
||||
if (!delete_sink)
|
||||
return false;
|
||||
|
||||
BOOL pfAnyOperationsAborted;
|
||||
|
||||
// Processes the queued command DeleteItem. This will trigger
|
||||
// the DeleteFileProgressSink to check for Recycle Bin.
|
||||
return SUCCEEDED(pfo->DeleteItem(delete_item.Get(), delete_sink.Get())) &&
|
||||
SUCCEEDED(pfo->PerformOperations());
|
||||
SUCCEEDED(pfo->PerformOperations()) &&
|
||||
SUCCEEDED(pfo->GetAnyOperationsAborted(&pfAnyOperationsAborted)) &&
|
||||
!pfAnyOperationsAborted;
|
||||
}
|
||||
|
||||
bool GetFolderPath(int key, base::FilePath* result) {
|
||||
|
||||
Reference in New Issue
Block a user