diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-18 00:34:56 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-18 00:34:56 +0000 |
| commit | 200e80dc6a93fa165551590e9cb1ba589ec0958e (patch) | |
| tree | c5c878f63eadd0c8e1d6477570a6b37d1bb0b819 /net | |
| parent | d4c755d3917ec20b811d4b868c18cb40cae6713b (diff) | |
| download | chromium_src-200e80dc6a93fa165551590e9cb1ba589ec0958e.zip chromium_src-200e80dc6a93fa165551590e9cb1ba589ec0958e.tar.gz chromium_src-200e80dc6a93fa165551590e9cb1ba589ec0958e.tar.bz2 | |
Revert "Add proxy config (using gnome-network-preferences)"
This reverts commit d06bc0c855b1e81e36c7bfc9bef342eb358d99a5.
TBR=estade
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/proxy/proxy_config_service_linux.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index eef6d97..f85e450 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -7,7 +7,6 @@ #include <gconf/gconf-client.h> #include <stdlib.h> -#include "base/linux_util.h" #include "base/logging.h" #include "base/string_tokenizer.h" #include "base/string_util.h" @@ -536,6 +535,13 @@ ProxyConfigServiceLinux::Delegate::Delegate( } bool ProxyConfigServiceLinux::Delegate::ShouldTryGConf() { + // GNOME_DESKTOP_SESSION_ID being defined is a good indication that + // we are probably running under GNOME. + // Note: KDE_FULL_SESSION is a corresponding env var to recognize KDE. + std::string dummy, desktop_session; + return env_var_getter_->Getenv("GNOME_DESKTOP_SESSION_ID", &dummy) + || (env_var_getter_->Getenv("DESKTOP_SESSION", &desktop_session) + && desktop_session == "gnome"); // I (sdoyon) would have liked to prioritize environment variables // and only fallback to gconf if env vars were unset. But // gnome-terminal "helpfully" sets http_proxy and no_proxy, and it @@ -543,7 +549,6 @@ bool ProxyConfigServiceLinux::Delegate::ShouldTryGConf() { // mislead us. // // We could introduce a CHROME_PROXY_OBEY_ENV_VARS variable...?? - return base::UseGnomeForSettings(); } void ProxyConfigServiceLinux::Delegate::SetupAndFetchInitialConfig( |