Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(539)

Side by Side Diff: net/proxy/proxy_config_service_linux.cc

Issue 1442001: GTK: Turn on the GTK+ integration by default. (Closed)
Patch Set: Only use gtk in gnome/xfce by default Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/proxy/proxy_config_service_linux.h" 5 #include "net/proxy/proxy_config_service_linux.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <gconf/gconf-client.h> 9 #include <gconf/gconf-client.h>
10 #include <limits.h> 10 #include <limits.h>
(...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 // Figure out which GConfSettingGetterImpl to use, if any. 968 // Figure out which GConfSettingGetterImpl to use, if any.
969 switch (base::GetDesktopEnvironment(env_var_getter)) { 969 switch (base::GetDesktopEnvironment(env_var_getter)) {
970 case base::DESKTOP_ENVIRONMENT_GNOME: 970 case base::DESKTOP_ENVIRONMENT_GNOME:
971 gconf_getter_.reset(new GConfSettingGetterImplGConf()); 971 gconf_getter_.reset(new GConfSettingGetterImplGConf());
972 break; 972 break;
973 case base::DESKTOP_ENVIRONMENT_KDE3: 973 case base::DESKTOP_ENVIRONMENT_KDE3:
974 case base::DESKTOP_ENVIRONMENT_KDE4: 974 case base::DESKTOP_ENVIRONMENT_KDE4:
975 gconf_getter_.reset(new GConfSettingGetterImplKDE(env_var_getter)); 975 gconf_getter_.reset(new GConfSettingGetterImplKDE(env_var_getter));
976 break; 976 break;
977 case base::DESKTOP_ENVIRONMENT_OTHER: 977 case base::DESKTOP_ENVIRONMENT_OTHER:
978 case base::DESKTOP_ENVIRONMENT_XFCE:
Evan Stade 2010/03/26 19:37:35 XFCE before OTHER?
978 break; 979 break;
979 } 980 }
980 } 981 }
981 982
982 ProxyConfigServiceLinux::Delegate::Delegate( 983 ProxyConfigServiceLinux::Delegate::Delegate(
983 base::EnvironmentVariableGetter* env_var_getter, 984 base::EnvironmentVariableGetter* env_var_getter,
984 GConfSettingGetter* gconf_getter) 985 GConfSettingGetter* gconf_getter)
985 : env_var_getter_(env_var_getter), gconf_getter_(gconf_getter), 986 : env_var_getter_(env_var_getter), gconf_getter_(gconf_getter),
986 glib_default_loop_(NULL), io_loop_(NULL) { 987 glib_default_loop_(NULL), io_loop_(NULL) {
987 } 988 }
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
1126 : delegate_(new Delegate(env_var_getter)) { 1127 : delegate_(new Delegate(env_var_getter)) {
1127 } 1128 }
1128 1129
1129 ProxyConfigServiceLinux::ProxyConfigServiceLinux( 1130 ProxyConfigServiceLinux::ProxyConfigServiceLinux(
1130 base::EnvironmentVariableGetter* env_var_getter, 1131 base::EnvironmentVariableGetter* env_var_getter,
1131 GConfSettingGetter* gconf_getter) 1132 GConfSettingGetter* gconf_getter)
1132 : delegate_(new Delegate(env_var_getter, gconf_getter)) { 1133 : delegate_(new Delegate(env_var_getter, gconf_getter)) {
1133 } 1134 }
1134 1135
1135 } // namespace net 1136 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698