Index: net/proxy/proxy_info.h |
diff --git a/net/proxy/proxy_info.h b/net/proxy/proxy_info.h |
index 8424c51fa2d03043ed2ecd4b4d1e601eb6548808..e18c65cd50cc47b5a63067378364deb8e55779ca 100644 |
--- a/net/proxy/proxy_info.h |
+++ b/net/proxy/proxy_info.h |
@@ -28,25 +28,40 @@ class NET_EXPORT ProxyInfo { |
void Use(const ProxyInfo& proxy_info); |
// Uses a direct connection. |
+ // |
+ // Note that this method resets this instance unlike Fallback(), etc. which |
+ // only modify |proxy_list_|. For example, since |config_id_| is cleared, |
+ // ProxyService recognizes this instance as a new config after UseDirect() |
+ // call. |
mmenke
2015/01/09 21:11:14
"ProxyService recognizes" -> "the ProxyService may
tyoshino (SeeGerritForStatus)
2015/01/14 04:20:36
Done.
|
void UseDirect(); |
// Uses a direct connection. did_bypass_proxy() will return true to indicate |
// that the direct connection is the result of configured proxy bypass rules. |
+ // |
+ // See also the note for UseDirect(). |
void UseDirectWithBypassedProxy(); |
// Uses a specific proxy server, of the form: |
// proxy-uri = [<scheme> "://"] <hostname> [":" <port>] |
// This may optionally be a semi-colon delimited list of <proxy-uri>. |
// It is OK to have LWS between entries. |
+ // |
+ // See also the note for UseDirect(). |
void UseNamedProxy(const std::string& proxy_uri_list); |
// Sets the proxy list to a single entry, |proxy_server|. |
+ // |
+ // See also the note for UseDirect(). |
void UseProxyServer(const ProxyServer& proxy_server); |
// Parses from the given PAC result. |
+ // |
+ // See also the note for UseDirect(). |
void UsePacString(const std::string& pac_string); |
// Use the proxies from the given list. |
+ // |
+ // See also the note for UseDirect(). |
void UseProxyList(const ProxyList& proxy_list); |
// Returns true if this proxy info specifies a direct connection. |