platform_util shouldn't know about mate::Arguments

electron · Aug 10, 2019 · 6917260 · 6917260
1 parent f7c1a41
commit 6917260
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/shell/common/api/atom_api_shell.cc b/shell/common/api/atom_api_shell.cc
@@ -71,6 +71,13 @@ v8::Local<v8::Promise> OpenExternal(const GURL& url, mate::Arguments* args) {
   return handle;
 }
 
+bool MoveItemToTrash(const base::FilePath& full_path, mate::Arguments* args) {
+  bool delete_on_fail = false;
+  args->GetNext(&delete_on_fail);
+
+  return platform_util::MoveItemToTrash(full_path, delete_on_fail);
+}
+
 #if defined(OS_WIN)
 bool WriteShortcutLink(const base::FilePath& shortcut_path,
                        mate::Arguments* args) {
@@ -134,7 +141,7 @@ void Initialize(v8::Local<v8::Object> exports,
   dict.SetMethod("showItemInFolder", &platform_util::ShowItemInFolder);
   dict.SetMethod("openItem", &platform_util::OpenItem);
   dict.SetMethod("openExternal", &OpenExternal);
-  dict.SetMethod("moveItemToTrash", &platform_util::MoveItemToTrash);
+  dict.SetMethod("moveItemToTrash", &MoveItemToTrash);
   dict.SetMethod("beep", &platform_util::Beep);
 #if defined(OS_WIN)
   dict.SetMethod("writeShortcutLink", &WriteShortcutLink);

diff --git a/shell/common/platform_util.h b/shell/common/platform_util.h
@@ -42,7 +42,7 @@ void OpenExternal(const GURL& url,
                   OpenExternalCallback callback);
 
 // Move a file to trash.
-bool MoveItemToTrash(const base::FilePath& full_path, mate::Arguments* args);
+bool MoveItemToTrash(const base::FilePath& full_path, bool delete_on_fail);
 
 void Beep();
 

diff --git a/shell/common/platform_util_linux.cc b/shell/common/platform_util_linux.cc
@@ -82,7 +82,7 @@ void OpenExternal(const GURL& url,
     std::move(callback).Run(XDGOpen(url.spec(), false) ? "" : "Failed to open");
 }
 
-bool MoveItemToTrash(const base::FilePath& full_path, mate::Arguments* args) {
+bool MoveItemToTrash(const base::FilePath& full_path, bool delete_on_fail) {
   std::unique_ptr<base::Environment> env(base::Environment::Create());
 
   // find the trash method

diff --git a/shell/common/platform_util_mac.mm b/shell/common/platform_util_mac.mm
@@ -115,10 +115,10 @@ void OpenExternal(const GURL& url,
                  });
 }
 
-bool MoveItemToTrash(const base::FilePath& full_path, mate::Arguments* args) {
+bool MoveItemToTrash(const base::FilePath& full_path, bool delete_on_fail) {
   NSString* path_string = base::SysUTF8ToNSString(full_path.value());
   if (!path_string) {
-    args->ThrowError("moveItemToTrash(): Invalid path.");
+    LOG(WARNING) << "Invalid file path " << full_path.value();
     return false;
   }
 
@@ -128,8 +128,7 @@ bool MoveItemToTrash(const base::FilePath& full_path, mate::Arguments* args) {
                                                  resultingItemURL:nil
                                                             error:&err];
 
-  bool delete_on_fail = false;
-  if (args->GetNext(&delete_on_fail) && delete_on_fail) {
+  if (delete_on_fail) {
     // Some volumes may not support a Trash folder or it may be disabled
     // so these methods will report failure by returning NO or nil and
     // an NSError with NSFeatureUnsupportedError.

diff --git a/shell/common/platform_util_win.cc b/shell/common/platform_util_win.cc
@@ -335,7 +335,7 @@ void OpenExternal(const GURL& url,
       std::move(callback));
 }
 
-bool MoveItemToTrash(const base::FilePath& path, mate::Arguments* args) {
+bool MoveItemToTrash(const base::FilePath& path, bool delete_on_fail) {
   base::win::ScopedCOMInitializer com_initializer;
   if (!com_initializer.Succeeded())
     return false;