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

Unified Diff: net/proxy/proxy_service.h

Issue 332313003: Add Finch experiment for selectively bypassing proxies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: callback design (not yet done) Created 6 years, 6 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
Index: net/proxy/proxy_service.h
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index b6ef447d43b22eaa5a6e99971b9776cf4fde580a..3084f5e2c0516d90efa3cb9b996d5a6c5d2489b2 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -96,6 +96,7 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// remain alive for the lifetime of this ProxyService.
ProxyService(ProxyConfigService* config_service,
ProxyResolver* resolver,
+ NetworkDelegate* network_delegate,
mmenke 2014/06/27 18:59:35 Suggest making this an argument to ResolveProxy in
rcs 2014/06/28 03:53:38 Done.
NetLog* net_log);
virtual ~ProxyService();
@@ -124,6 +125,7 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
//
// Profiling information for the request is saved to |net_log| if non-NULL.
int ResolveProxy(const GURL& url,
+ int load_flags,
ProxyInfo* results,
const net::CompletionCallback& callback,
PacRequest** pac_request,
@@ -351,7 +353,8 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// Returns ERR_IO_PENDING if the request cannot be completed synchronously.
// Otherwise it fills |result| with the proxy information for |url|.
// Completing synchronously means we don't need to query ProxyResolver.
- int TryToCompleteSynchronously(const GURL& url, ProxyInfo* result);
+ int TryToCompleteSynchronously(const GURL& url, int load_flags,
+ ProxyInfo* result);
// Cancels all of the requests sent to the ProxyResolver. These will be
// restarted when calling SetReady().
@@ -444,6 +447,9 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// failed to fetch the PAC script) prevents proxy resolution.
int permanent_error_;
+ // Network Delegate manages callbacks to be invoked for upon Proxy Resolution.
mmenke 2014/06/27 18:59:35 nit: "NetworkDelegate", "proxy resolution"
rcs 2014/06/28 03:53:38 Done.
+ NetworkDelegate* network_delegate_;
+
// This is the log where any events generated by |init_proxy_resolver_| are
// sent to.
NetLog* net_log_;

Powered by Google App Engine
This is Rietveld 408576698