mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

feat: add shell.trashItem() to replace shell.moveItemToTrash() (#25114)

Browse source
This commit is contained in:
Jeremy Rose 2020-09-02 10:32:33 -07:00 • committed by GitHub
parent e9e7eee25e
commit 1b6534b326
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 212 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

24
shell/common/platform_util_mac.mm
View file

@ -117,10 +117,13 @@ void OpenExternal(const GURL& url,
});
}
bool MoveItemToTrash(const base::FilePath& full_path, bool delete_on_fail) {
bool MoveItemToTrashWithError(const base::FilePath& full_path,
bool delete_on_fail,
std::string* error) {
NSString* path_string = base::SysUTF8ToNSString(full_path.value());
if (!path_string) {
LOG(WARNING) << "Invalid file path " << full_path.value();
*error = "Invalid file path: " + full_path.value();
LOG(WARNING) << *error;
return false;
}
@ -142,14 +145,27 @@ bool MoveItemToTrash(const base::FilePath& full_path, bool delete_on_fail) {
}
if (!did_trash) {
*error = base::SysNSStringToUTF8([err localizedDescription]);
LOG(WARNING) << "NSWorkspace failed to move file " << full_path.value()
<< " to trash: "
<< base::SysNSStringToUTF8([err localizedDescription]);
<< " to trash: " << *error;
}
return did_trash;
}
bool MoveItemToTrash(const base::FilePath& path, bool delete_on_fail) {
std::string error; // ignored
return MoveItemToTrashWithError(path, delete_on_fail, &error);
}
namespace internal {
bool PlatformTrashItem(const base::FilePath& full_path, std::string* error) {
return MoveItemToTrashWithError(full_path, false, error);
}
} // namespace internal
void Beep() {
NSBeep();
}