WIP / Do not commit

chrome/browser/platform_util_linux.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/platform_util.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 
 using content::BrowserThread;
 
 namespace {
 
-void XDGUtil(const std::string& util, const std::string& arg) {
+void XDGUtil(const std::string& util,
+             const std::string& arg,
+             base::ProcessHandle* process_handle) {
   std::vector<std::string> argv;
   argv.push_back(util);
   argv.push_back(arg);
 
   base::environment_vector env;
   // xdg-open can fall back on mailcap which eventually might plumb through
   // to a command that needs a terminal.  Set the environment variable telling
   // it that we definitely don't have a terminal available and that it should
   // bring up a new terminal if necessary.  See "man mailcap".
   env.push_back(std::make_pair("MM_NOTTTY", "1"));
 
   // In Google Chrome, we do not let GNOME's bug-buddy intercept our crashes.
   // However, we do not want this environment variable to propagate to external
   // applications. See http://crbug.com/24120
   char* disable_gnome_bug_buddy = getenv("GNOME_DISABLE_CRASH_DIALOG");
   if (disable_gnome_bug_buddy &&
       disable_gnome_bug_buddy == std::string("SET_BY_GOOGLE_CHROME")) {
     env.push_back(std::make_pair("GNOME_DISABLE_CRASH_DIALOG", ""));
   }
 
   base::ProcessHandle handle;
   base::LaunchOptions options;
   options.environ = &env;
-  if (base::LaunchProcess(argv, options, &handle))
-    base::EnsureProcessGetsReaped(handle);
+  if (base::LaunchProcess(argv, options, &handle)) {
+    if (process_handle)
+      *process_handle = handle;
+    else
+      base::EnsureProcessGetsReaped(handle);
+  }
 }
 
-void XDGOpen(const std::string& path) {
-  XDGUtil("xdg-open", path);
+void XDGOpen(const std::string& path, base::ProcessHandle* process_handle) {
+  XDGUtil("xdg-open", path, process_handle);
 }
 
 void XDGEmail(const std::string& email) {
-  XDGUtil("xdg-email", email);
+  XDGUtil("xdg-email", email, NULL);
 }
 
 // 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 FilePath& full_path) {
   FilePath dir = full_path.DirName();
   if (!file_util::DirectoryExists(dir))
     return;
 
-  XDGOpen(dir.value());
+  XDGOpen(dir.value(), base::kNullProcessHandle);
 }
 
 }  // namespace
 
 namespace platform_util {
 
 void ShowItemInFolder(const FilePath& full_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&ShowItemInFolderOnFileThread, full_path));
 }
 
-void OpenItem(const FilePath& full_path) {
+void OpenItem(const FilePath& full_path, base::ProcessHandle* process_handle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
-      base::Bind(&XDGOpen, full_path.value()));
+      base::Bind(&XDGOpen, full_path.value(), process_handle));
 }
 
 void OpenExternal(const GURL& url) {
   if (url.SchemeIs("mailto"))
     XDGEmail(url.spec());
   else
-    XDGOpen(url.spec());
+    XDGOpen(url.spec(), base::kNullProcessHandle);
 }
 
 }  // namespace platform_util