summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_config.h
diff options
context:
space:
mode:
authorsdoyon@chromium.org <sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-20 16:50:56 +0000
committersdoyon@chromium.org <sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-20 16:50:56 +0000
commit861c6c6d56add9157e04aa2ac43bec8e33bf1cc1 (patch)
tree835dd6466912cd073e3ac16177252fe0c8865c93 /net/proxy/proxy_config.h
parentbc1529bbafc42d96d9ac0839bcb0ba1ab9328445 (diff)
downloadchromium_src-861c6c6d56add9157e04aa2ac43bec8e33bf1cc1.zip
chromium_src-861c6c6d56add9157e04aa2ac43bec8e33bf1cc1.tar.gz
chromium_src-861c6c6d56add9157e04aa2ac43bec8e33bf1cc1.tar.bz2
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
Diffstat (limited to 'net/proxy/proxy_config.h')
-rw-r--r--net/proxy/proxy_config.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/net/proxy/proxy_config.h b/net/proxy/proxy_config.h
index 4c3a731..ec6c1fc 100644
--- a/net/proxy/proxy_config.h
+++ b/net/proxy/proxy_config.h
@@ -107,8 +107,13 @@ class ProxyConfig {
} // namespace net
-// Dump a human-readable string representation of the configuration to |out|;
+// Dumps a human-readable string representation of the configuration to |out|;
// used when logging the configuration changes.
std::ostream& operator<<(std::ostream& out, const net::ProxyConfig& config);
+// Dumps a human-readable string representation of the |rules| to |out|;
+// used for logging and for better unittest failure output.
+std::ostream& operator<<(std::ostream& out,
+ const net::ProxyConfig::ProxyRules& rules);
+
#endif // NET_PROXY_PROXY_CONFIG_H_