diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-03 12:02:41 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-03 12:02:41 +0000 |
| commit | 82a3767c45e85b77fb41d4fc92fc49fcb879e75b (patch) | |
| tree | c1e8b1cc380f014a68c194929fb1abd799981cec /chrome | |
| parent | ef1cef9aef6034dda84cee719d2c9012bfb75a5e (diff) | |
| download | chromium_src-82a3767c45e85b77fb41d4fc92fc49fcb879e75b.zip chromium_src-82a3767c45e85b77fb41d4fc92fc49fcb879e75b.tar.gz chromium_src-82a3767c45e85b77fb41d4fc92fc49fcb879e75b.tar.bz2 | |
Add a method for PAC script errors to the network delegate.
Also add a wrapper class to avoid passing around raw NULL pointers, and a bridge so I can invoke the method from other than the IO thread
BUG=48930
TEST=net unittests
Review URL: http://codereview.chromium.org/6822026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/net/chrome_network_delegate.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/net/chrome_network_delegate.h | 1 | ||||
| -rw-r--r-- | chrome/browser/net/connection_tester.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/net/proxy_service_factory.cc | 3 |
4 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index 0613baa..372a7fb 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -132,3 +132,7 @@ net::URLRequestJob* ChromeNetworkDelegate::OnMaybeCreateURLRequestJob( return NULL; return protocol_handler_registry_->MaybeCreateJob(request); } + +void ChromeNetworkDelegate::OnPACScriptError(int line_number, + const string16& error) { +} diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h index 4edc01a..a26bc31 100644 --- a/chrome/browser/net/chrome_network_delegate.h +++ b/chrome/browser/net/chrome_network_delegate.h @@ -55,6 +55,7 @@ class ChromeNetworkDelegate : public net::NetworkDelegate { virtual void OnHttpTransactionDestroyed(uint64 request_id); virtual net::URLRequestJob* OnMaybeCreateURLRequestJob( net::URLRequest* request); + virtual void OnPACScriptError(int line_number, const string16& error); scoped_refptr<ExtensionEventRouterForwarder> event_router_; const ProfileId profile_id_; diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc index 47023e3..84d45d9 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/chrome/browser/net/connection_tester.cc @@ -187,6 +187,7 @@ class ExperimentURLRequestContext : public net::URLRequestContext { 0u, new net::ProxyScriptFetcherImpl(proxy_request_context_), host_resolver(), + NULL, NULL)); return net::OK; diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc index ad9afd0..ba1cb9a 100644 --- a/chrome/browser/net/proxy_service_factory.cc +++ b/chrome/browser/net/proxy_service_factory.cc @@ -89,7 +89,8 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService( num_pac_threads, new net::ProxyScriptFetcherImpl(context), context->host_resolver(), - net_log); + net_log, + context->network_delegate()); } else { proxy_service = net::ProxyService::CreateUsingSystemProxyResolver( proxy_config_service, |