fix: crash when showin item in folder on DevTools

electron · Feb 21, 2022 · 0344393 · 0344393
1 parent bdad633
commit 0344393
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/shell/browser/ui/inspectable_web_contents.cc b/shell/browser/ui/inspectable_web_contents.cc
@@ -729,6 +729,11 @@ void InspectableWebContents::SetIsDocked(DispatchCallback callback,
     std::move(callback).Run(nullptr);
 }
 
+void InspectableWebContents::OnOpenItemComplete(const base::FilePath& path,
+                                                const std::string& result) {
+  platform_util::ShowItemInFolder(path);
+}
+
 void InspectableWebContents::OpenInNewTab(const std::string& url) {}
 
 void InspectableWebContents::ShowItemInFolder(
@@ -737,9 +742,10 @@ void InspectableWebContents::ShowItemInFolder(
     return;
 
   base::FilePath path = base::FilePath::FromUTF8Unsafe(file_system_path);
-
-  // Pass empty callback here; we can ignore errors
-  platform_util::OpenPath(path, platform_util::OpenCallback());
+  platform_util::OpenPath(
+      path.DirName(),
+      base::BindOnce(&InspectableWebContents::OnOpenItemComplete,
+                     weak_factory_.GetWeakPtr(), path));
 }
 
 void InspectableWebContents::SaveToFile(const std::string& url,

diff --git a/shell/browser/ui/inspectable_web_contents.h b/shell/browser/ui/inspectable_web_contents.h
@@ -166,6 +166,9 @@ class InspectableWebContents
   void CanShowSurvey(DispatchCallback callback,
                      const std::string& trigger) override {}
 
+  void OnOpenItemComplete(const base::FilePath& path,
+                          const std::string& result);
+
   // content::DevToolsFrontendHostDelegate:
   void HandleMessageFromDevToolsFrontend(base::Value message);