Merge 36569 - Linux: Don't propagate $GNOME_DISABLE_CRASH_DIALOG to external ...

chrome/common/platform_util_linux.cc

 // Copyright (c) 2009 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/common/platform_util.h"
 
 #include <gtk/gtk.h>
 
 #include "base/file_util.h"
 #include "base/process_util.h"
@@ skipping 10 matching lines @@
   argv.push_back("xdg-open");
   argv.push_back(path);
 
   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::file_handle_mapping_vector no_files;
   base::ProcessHandle handle;
   if (base::LaunchApp(argv, env, no_files, false, &handle))
     ProcessWatcher::EnsureProcessGetsReaped(handle);
 }
 
 }  // namespace
 
 namespace platform_util {
 
@@ skipping 64 matching lines @@
     // do nothing.
   } else {
     modifier = "unknown";
   }
 #endif
 
   return ASCIIToUTF16(modifier);
 }
 
 }  // namespace platform_util