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

Unified Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 332313003: Add Finch experiment for selectively bypassing proxies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 2-line change: Add missing ifdef(SPDY_PROXY_AUTH_ORIGIN); previously only compiled on android, but … 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: chrome/browser/net/chrome_network_delegate.cc
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index 6558ae123a8d01eac386242f1b1d44222e8e392a..bc3c965d02785c41fd16bd18a698f80724623d35 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -302,7 +302,8 @@ ChromeNetworkDelegate::ChromeNetworkDelegate(
prerender_tracker_(NULL),
data_reduction_proxy_params_(NULL),
data_reduction_proxy_usage_stats_(NULL),
- data_reduction_proxy_auth_request_handler_(NULL) {
+ data_reduction_proxy_auth_request_handler_(NULL),
+ on_resolve_proxy_handler_(NULL) {
DCHECK(enable_referrers);
extensions_delegate_.reset(
ChromeExtensionsNetworkDelegate::Create(event_router));
@@ -474,6 +475,13 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
return rv;
}
+void ChromeNetworkDelegate::OnResolveProxy(
+ const GURL& url, int load_flags, net::ProxyInfo* result) {
+ if (on_resolve_proxy_handler_) {
+ on_resolve_proxy_handler_->Run(url, load_flags, result);
+ }
mmenke 2014/07/01 19:45:12 nit: Preferred style in this file seems to be not
rcs 2014/07/02 00:56:20 Done.
+}
+
int ChromeNetworkDelegate::OnBeforeSendHeaders(
net::URLRequest* request,
const net::CompletionCallback& callback,

Powered by Google App Engine
This is Rietveld 408576698