Index: chrome/browser/platform_util_linux.cc |
diff --git a/chrome/browser/platform_util_linux.cc b/chrome/browser/platform_util_linux.cc |
index 60d446714633c179e3c1102e0ee96a5195c90b60..5e65bc2e1606689538a251d3bd3d042afba23e3e 100644 |
--- a/chrome/browser/platform_util_linux.cc |
+++ b/chrome/browser/platform_util_linux.cc |
@@ -21,25 +21,22 @@ void XDGUtil(const std::string& util, const std::string& arg) { |
argv.push_back(util); |
argv.push_back(arg); |
- base::EnvironmentVector env; |
+ base::LaunchOptions options; |
// 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")); |
+ options.environ["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", "")); |
- } |
+ disable_gnome_bug_buddy == std::string("SET_BY_GOOGLE_CHROME")) |
+ options.environ["GNOME_DISABLE_CRASH_DIALOG"] = std::string(); |
base::ProcessHandle handle; |
- base::LaunchOptions options; |
- options.environ = &env; |
if (base::LaunchProcess(argv, options, &handle)) |
base::EnsureProcessGetsReaped(handle); |
} |