diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-19 06:30:14 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-19 06:30:14 +0000 |
| commit | 2297bb2e0d56ff0221f3ac379ff6f25f2e29cb22 (patch) | |
| tree | 6b4e2b6818712e3dbdb42702a90ec1319429770a /net/proxy | |
| parent | 71fc4ec02fafb47f0341d5daec41a266de2cc033 (diff) | |
| download | chromium_src-2297bb2e0d56ff0221f3ac379ff6f25f2e29cb22.zip chromium_src-2297bb2e0d56ff0221f3ac379ff6f25f2e29cb22.tar.gz chromium_src-2297bb2e0d56ff0221f3ac379ff6f25f2e29cb22.tar.bz2 | |
Move const string declaration into #ifdef USE_GIO block
The string is only used in that block, causing Clang errors when USE_GIO
isn't defined.
BUG=none
Review URL: https://codereview.chromium.org/331223004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278282 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_config_service_linux.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index 6fbf3d5..158fd5c 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -205,7 +205,6 @@ bool ProxyConfigServiceLinux::Delegate::GetConfigFromEnv(ProxyConfig* config) { namespace { const int kDebounceTimeoutMilliseconds = 250; -const char kProxyGConfSchema[] = "org.gnome.system.proxy"; #if defined(USE_GCONF) // This setting getter uses gconf, as used in GNOME 2 and some GNOME 3 desktops. @@ -521,6 +520,8 @@ class SettingGetterImplGConf : public ProxyConfigServiceLinux::SettingGetter { #endif // defined(USE_GCONF) #if defined(USE_GIO) +const char kProxyGConfSchema[] = "org.gnome.system.proxy"; + // This setting getter uses gsettings, as used in most GNOME 3 desktops. class SettingGetterImplGSettings : public ProxyConfigServiceLinux::SettingGetter { |