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

Unified Diff: net/proxy/proxy_info.h

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/proxy_config_unittest.cc ('k') | net/proxy/proxy_info_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_info.h
diff --git a/net/proxy/proxy_info.h b/net/proxy/proxy_info.h
index 1e4fdedc1100921e56d3351ed1e36ab3d58c1556..8424c51fa2d03043ed2ecd4b4d1e601eb6548808 100644
--- a/net/proxy/proxy_info.h
+++ b/net/proxy/proxy_info.h
@@ -131,6 +131,11 @@ class NET_EXPORT ProxyInfo {
ProxyConfig::ID config_id() const { return config_id_; }
+ // Returns the list of proxies to use.
+ const ProxyList& proxy_list() const {
+ return proxy_list_;
+ }
+
base::TimeTicks proxy_resolve_start_time() const {
return proxy_resolve_start_time_;
}
« no previous file with comments | « net/proxy/proxy_config_unittest.cc ('k') | net/proxy/proxy_info_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698