diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 23:28:08 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 23:28:08 +0000 |
| commit | 425be73ff46ed6961322f7f412a2d403b371fc69 (patch) | |
| tree | 5b2148b4d77238cefbef409b3390e120144ec0d3 /net | |
| parent | 85b893f08d534d5146d94de1863a4e0ac0cbf75c (diff) | |
| download | chromium_src-425be73ff46ed6961322f7f412a2d403b371fc69.zip chromium_src-425be73ff46ed6961322f7f412a2d403b371fc69.tar.gz chromium_src-425be73ff46ed6961322f7f412a2d403b371fc69.tar.bz2 | |
Add proxy config (using gnome-network-preferences)
BUG=11507
TEST=Open options, click change proxy, gnome-network-preferences should launch. If gnome isn't installed, LinuxProxyConfig wiki page should load.
Review URL: http://codereview.chromium.org/149785
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21023 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/proxy/proxy_config_service_linux.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index f85e450..eef6d97 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -7,6 +7,7 @@ #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" @@ -535,13 +536,6 @@ 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 @@ -549,6 +543,7 @@ bool ProxyConfigServiceLinux::Delegate::ShouldTryGConf() { // mislead us. // // We could introduce a CHROME_PROXY_OBEY_ENV_VARS variable...?? + return base::UseGnomeForSettings(); } void ProxyConfigServiceLinux::Delegate::SetupAndFetchInitialConfig( |