| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #ifndef NET_PROXY_PROXY_CONFIG_H_ | 5 #ifndef NET_PROXY_PROXY_CONFIG_H_ |
| 6 #define NET_PROXY_PROXY_CONFIG_H_ | 6 #define NET_PROXY_PROXY_CONFIG_H_ |
| 7 | 7 |
| 8 #include <ostream> | 8 #include <ostream> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 // Set if |type| is TYPE_PROXY_PER_SCHEME. | 85 // Set if |type| is TYPE_PROXY_PER_SCHEME. |
| 86 ProxyServer proxy_for_http; | 86 ProxyServer proxy_for_http; |
| 87 ProxyServer proxy_for_https; | 87 ProxyServer proxy_for_https; |
| 88 ProxyServer proxy_for_ftp; | 88 ProxyServer proxy_for_ftp; |
| 89 }; | 89 }; |
| 90 | 90 |
| 91 ProxyRules proxy_rules; | 91 ProxyRules proxy_rules; |
| 92 | 92 |
| 93 // Indicates a list of hosts that should bypass any proxy configuration. For | 93 // Indicates a list of hosts that should bypass any proxy configuration. For |
| 94 // these hosts, a direct connection should always be used. | 94 // these hosts, a direct connection should always be used. |
| 95 // The form <host>:<port> is also supported, meaning that only |
| 96 // connections on the specified port should be direct. |
| 95 std::vector<std::string> proxy_bypass; | 97 std::vector<std::string> proxy_bypass; |
| 96 | 98 |
| 97 // Indicates whether local names (no dots) bypass proxies. | 99 // Indicates whether local names (no dots) bypass proxies. |
| 98 bool proxy_bypass_local_names; | 100 bool proxy_bypass_local_names; |
| 99 | 101 |
| 100 // Returns true if the given config is equivalent to this config. | 102 // Returns true if the given config is equivalent to this config. |
| 101 bool Equals(const ProxyConfig& other) const; | 103 bool Equals(const ProxyConfig& other) const; |
| 102 | 104 |
| 103 private: | 105 private: |
| 104 static int last_id_; | 106 static int last_id_; |
| 105 int id_; | 107 int id_; |
| 106 }; | 108 }; |
| 107 | 109 |
| 108 } // namespace net | 110 } // namespace net |
| 109 | 111 |
| 110 // Dump a human-readable string representation of the configuration to |out|; | 112 // Dump a human-readable string representation of the configuration to |out|; |
| 111 // used when logging the configuration changes. | 113 // used when logging the configuration changes. |
| 112 std::ostream& operator<<(std::ostream& out, const net::ProxyConfig& config); | 114 std::ostream& operator<<(std::ostream& out, const net::ProxyConfig& config); |
| 113 | 115 |
| 114 #endif // NET_PROXY_PROXY_CONFIG_H_ | 116 #endif // NET_PROXY_PROXY_CONFIG_H_ |
| OLD | NEW |