Be explicit about target type in platform_util::OpenItem()

chrome/browser/platform_util_linux.cc

Index: chrome/browser/platform_util_linux.cc
diff --git a/chrome/browser/platform_util_linux.cc b/chrome/browser/platform_util_linux.cc
index c94f8fed2a3d3d3bd7e10c96cf4c900a54d9f58a..2df78cf7ac43921302f50f991cf50d42defd6b01 100644
--- a/chrome/browser/platform_util_linux.cc
+++ b/chrome/browser/platform_util_linux.cc
@@ -9,19 +9,25 @@
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/platform_util_internal.h"
 #include "content/public/browser/browser_thread.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 
+namespace platform_util {
+
 namespace {
 
-void XDGUtil(const std::string& util, const std::string& arg) {
+void XDGUtil(const std::string& util,
+             const base::FilePath& working_directory,
+             const std::string& arg) {
   std::vector<std::string> argv;
   argv.push_back(util);
   argv.push_back(arg);
 
   base::LaunchOptions options;
+  options.current_directory = working_directory;
   options.allow_new_privs = true;
   // xdg-open can fall back on mailcap which eventually might plumb through
   // to a command that needs a terminal.  Set the environment variable telling
@@ -42,39 +48,29 @@ void XDGUtil(const std::string& util, const std::string& arg) {
     base::EnsureProcessGetsReaped(process.Pid());
 }
 
-void XDGOpen(const std::string& path) {
-  XDGUtil("xdg-open", path);
+void XDGOpen(const base::FilePath& working_directory, const std::string& path) {
+  XDGUtil("xdg-open", working_directory, path);
 }
 
 void XDGEmail(const std::string& email) {
-  XDGUtil("xdg-email", email);
-}
-
-// TODO(estade): It would be nice to be able to select the file in the file
-// manager, but that probably requires extending xdg-open. For now just
-// show the folder.
-void ShowItemInFolderOnFileThread(const base::FilePath& full_path) {
-  base::FilePath dir = full_path.DirName();
-  if (!base::DirectoryExists(dir))
-    return;
-
-  XDGOpen(dir.value());
+  XDGUtil("xdg-email", base::FilePath(), email);
 }
 
 }  // namespace
 
-namespace platform_util {
+namespace internal {
 
-void ShowItemInFolder(Profile* profile, const base::FilePath& full_path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
-      base::Bind(&ShowItemInFolderOnFileThread, full_path));
+void PlatformOpenVerifiedItem(const base::FilePath& path, OpenItemType type) {
+  XDGOpen(type == OPEN_FILE ? path.DirName() : path, path.value());

[rickyz (no longer on Chrome), 2015/02/06 01:09:59]

In the case of OPEN_DIR, we can avoid passing the path as an argument with
something like:

if (type == OPEN_FILE) {
  XDGOpen(base::FilePath(), path.value());
} else if (type == OPEN_DIR) {
  XDGOpen(path, ".");
}

[asanka, 2015/02/06 23:16:11]

Thanks. The OPEN_FOLDER case is now handled via XDGOpen(path, "."). I opted to
use a switch() since that causes a compile error if someone were to add another
enum value.

I also kept the logic for using the containing directory as the current_folder
when handling the OPEN_FILE case. The latter seems to yield a better user
experience if, for example, the user invokes a file chooser from the launched
application. If the current_directory is not explicitly set, the folder that
would be opened by default would be the one containing google-chrome or
chromium, rather than the folder containing the opened file.

+}
 }
 
-void OpenItem(Profile* profile, const base::FilePath& full_path) {
+void ShowItemInFolder(Profile* profile, const base::FilePath& full_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
-      base::Bind(&XDGOpen, full_path.value()));
+  // TODO(estade): It would be nice to be able to select the file in the file
+  // manager, but that probably requires extending xdg-open. For now just show
+  // the folder.
+  OpenFolder(profile, full_path.DirName(), OpenOperationCallback());
 }
 
 void OpenExternal(Profile* profile, const GURL& url) {
@@ -82,7 +78,7 @@ void OpenExternal(Profile* profile, const GURL& url) {
   if (url.SchemeIs("mailto"))
     XDGEmail(url.spec());
   else
-    XDGOpen(url.spec());
+    XDGOpen(base::FilePath(), url.spec());
 }
 
 }  // namespace platform_util