Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: net/proxy/proxy_info.h

Issue 473513002: Keep track of network error in ProxyRetryInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge to head. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_INFO_H_ 5 #ifndef NET_PROXY_PROXY_INFO_H_
6 #define NET_PROXY_PROXY_INFO_H_ 6 #define NET_PROXY_PROXY_INFO_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 const ProxyServer& proxy_server() const { return proxy_list_.Get(); } 110 const ProxyServer& proxy_server() const { return proxy_list_.Get(); }
111 111
112 // Returns the source for configuration settings used for proxy resolution. 112 // Returns the source for configuration settings used for proxy resolution.
113 ProxyConfigSource config_source() const { return config_source_; } 113 ProxyConfigSource config_source() const { return config_source_; }
114 114
115 // See description in ProxyList::ToPacString(). 115 // See description in ProxyList::ToPacString().
116 std::string ToPacString() const; 116 std::string ToPacString() const;
117 117
118 // Marks the current proxy as bad. Returns true if there is another proxy 118 // Marks the current proxy as bad. Returns true if there is another proxy
119 // available to try in proxy list_. 119 // available to try in proxy list_.
120 bool Fallback(const BoundNetLog& net_log); 120 bool Fallback(const int net_error, const BoundNetLog& net_log);
Ryan Sleevi 2014/08/15 00:02:23 no const
Not at Google. Contact bengr 2014/08/15 17:26:59 Done. Removed from .cc as well.
121 121
122 // De-prioritizes the proxies that we have cached as not working, by moving 122 // De-prioritizes the proxies that we have cached as not working, by moving
123 // them to the end of the proxy list. 123 // them to the end of the proxy list.
124 void DeprioritizeBadProxies(const ProxyRetryInfoMap& proxy_retry_info); 124 void DeprioritizeBadProxies(const ProxyRetryInfoMap& proxy_retry_info);
125 125
126 // Deletes any entry which doesn't have one of the specified proxy schemes. 126 // Deletes any entry which doesn't have one of the specified proxy schemes.
127 void RemoveProxiesWithoutScheme(int scheme_bit_field); 127 void RemoveProxiesWithoutScheme(int scheme_bit_field);
128 128
129 ProxyConfig::ID config_id() const { return config_id_; } 129 ProxyConfig::ID config_id() const { return config_id_; }
130 130
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 167
168 // How long it took to resolve the proxy. Times are both null if proxy was 168 // How long it took to resolve the proxy. Times are both null if proxy was
169 // determined synchronously without running a PAC. 169 // determined synchronously without running a PAC.
170 base::TimeTicks proxy_resolve_start_time_; 170 base::TimeTicks proxy_resolve_start_time_;
171 base::TimeTicks proxy_resolve_end_time_; 171 base::TimeTicks proxy_resolve_end_time_;
172 }; 172 };
173 173
174 } // namespace net 174 } // namespace net
175 175
176 #endif // NET_PROXY_PROXY_INFO_H_ 176 #endif // NET_PROXY_PROXY_INFO_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698