From 861c6c6d56add9157e04aa2ac43bec8e33bf1cc1 Mon Sep 17 00:00:00 2001 From: "sdoyon@chromium.org" Date: Mon, 20 Apr 2009 16:50:56 +0000 Subject: ProxyConfigService for Linux. Establishes a ProxyConfig by reading settings from gconf or consulting environment variables. BUG=8143 Thanks to ermilov.maxim@gmail.com for his contribution: some ideas< and code snippets from his patch were folded into this one. (See http://codereview.chromium.org/49009) Review URL: http://codereview.chromium.org/60009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14034 0039d316-1c4b-4281-b951-d872f2087c98 --- net/proxy/proxy_config.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'net/proxy/proxy_config.cc') diff --git a/net/proxy/proxy_config.cc b/net/proxy/proxy_config.cc index 009fcf0..20c0e3a 100644 --- a/net/proxy/proxy_config.cc +++ b/net/proxy/proxy_config.cc @@ -91,7 +91,8 @@ std::ostream& operator<<(std::ostream& out, return out; } -// Helper to stringize a ProxyRules. +} // namespace + std::ostream& operator<<(std::ostream& out, const net::ProxyConfig::ProxyRules& rules) { // Stringize the type enum. @@ -119,8 +120,6 @@ std::ostream& operator<<(std::ostream& out, << " }"; } -} // namespace - std::ostream& operator<<(std::ostream& out, const net::ProxyConfig& config) { out << "{\n" << " auto_detect: " << config.auto_detect << "\n" -- cgit v1.1