summaryrefslogtreecommitdiffstats
path: root/net/proxy
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 20:04:06 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 20:04:06 +0000
commit88c50ab803907cb0ea0c7acc14f94dbb267d473f (patch)
treedde8db67ef4e94abc64f700adc38cfdc1a88a9d6 /net/proxy
parent5a9b083b725c8f9b40ad53ad6cc0f97e8f6d211b (diff)
downloadchromium_src-88c50ab803907cb0ea0c7acc14f94dbb267d473f.zip
chromium_src-88c50ab803907cb0ea0c7acc14f94dbb267d473f.tar.gz
chromium_src-88c50ab803907cb0ea0c7acc14f94dbb267d473f.tar.bz2
GTK: Turn on the GTK+ integration by default.
This will regress default startup time for users by 50ms. This doesn't matter because this is what the users want--I've lost count of the number bloggers, people on twitter, and people in our IRC channel complaining about the lack of GTK+ integration...when it's just not on by default. BUG=none TEST=none Review URL: http://codereview.chromium.org/1442001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
-rw-r--r--net/proxy/proxy_config_service_linux.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc
index c1d18dd..a43a7e8 100644
--- a/net/proxy/proxy_config_service_linux.cc
+++ b/net/proxy/proxy_config_service_linux.cc
@@ -974,6 +974,7 @@ ProxyConfigServiceLinux::Delegate::Delegate(
case base::DESKTOP_ENVIRONMENT_KDE4:
gconf_getter_.reset(new GConfSettingGetterImplKDE(env_var_getter));
break;
+ case base::DESKTOP_ENVIRONMENT_XFCE:
case base::DESKTOP_ENVIRONMENT_OTHER:
break;
}