summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 07:00:13 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 07:00:13 +0000
commit9ec8db0fa5c9e8e449c2552154424535ae20f789 (patch)
treeb3f9dd2bc3f46c10d0657653f97b1cd307b70723 /chrome/common
parent685092ab45505a2bb8c138ecd2207dde16305450 (diff)
downloadchromium_src-9ec8db0fa5c9e8e449c2552154424535ae20f789.zip
chromium_src-9ec8db0fa5c9e8e449c2552154424535ae20f789.tar.gz
chromium_src-9ec8db0fa5c9e8e449c2552154424535ae20f789.tar.bz2
Set GTK_PATH to CHROMIUM_SAVED_GTK_PATH before launching xdg-open.
Wrappers that launch Chromium will need to set CHROMIUM_SAVED_GTK_PATH before modifying GTK_PATH. This can be done later in separate CLs. BUG=15565 TEST=see bug Review URL: http://codereview.chromium.org/159112 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/platform_util_linux.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/common/platform_util_linux.cc b/chrome/common/platform_util_linux.cc
index b13033c..7a4e92b 100644
--- a/chrome/common/platform_util_linux.cc
+++ b/chrome/common/platform_util_linux.cc
@@ -18,8 +18,10 @@ void XDGOpen(const FilePath& path) {
argv.push_back("xdg-open");
argv.push_back(path.value());
base::file_handle_mapping_vector no_files;
+ base::environment_vector env;
+ env.push_back(std::make_pair("GTK_PATH", getenv("CHROMIUM_SAVED_GTK_PATH")));
base::ProcessHandle handle;
- if (base::LaunchApp(argv, no_files, false, &handle))
+ if (base::LaunchApp(argv, env, no_files, false, &handle))
ProcessWatcher::EnsureProcessGetsReaped(handle);
}