OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #include "net/http/http_cache.h" | 5 #include "net/http/http_cache.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 | 10 |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 return VerifyResponse(result); | 229 return VerifyResponse(result); |
230 SelfDestroy(); | 230 SelfDestroy(); |
231 } | 231 } |
232 | 232 |
233 //----------------------------------------------------------------------------- | 233 //----------------------------------------------------------------------------- |
234 | 234 |
235 HttpCache::HttpCache(NetworkChangeNotifier* network_change_notifier, | 235 HttpCache::HttpCache(NetworkChangeNotifier* network_change_notifier, |
236 HostResolver* host_resolver, ProxyService* proxy_service, | 236 HostResolver* host_resolver, ProxyService* proxy_service, |
237 SSLConfigService* ssl_config_service, | 237 SSLConfigService* ssl_config_service, |
238 HttpAuthHandlerFactory* http_auth_handler_factory, | 238 HttpAuthHandlerFactory* http_auth_handler_factory, |
| 239 NetLog* net_log, |
239 BackendFactory* backend_factory) | 240 BackendFactory* backend_factory) |
240 : backend_factory_(backend_factory), | 241 : backend_factory_(backend_factory), |
241 temp_backend_(NULL), | 242 temp_backend_(NULL), |
242 building_backend_(false), | 243 building_backend_(false), |
243 mode_(NORMAL), | 244 mode_(NORMAL), |
244 network_layer_(HttpNetworkLayer::CreateFactory( | 245 network_layer_(HttpNetworkLayer::CreateFactory( |
245 network_change_notifier, host_resolver, proxy_service, | 246 network_change_notifier, host_resolver, proxy_service, |
246 ssl_config_service, http_auth_handler_factory)), | 247 ssl_config_service, http_auth_handler_factory, |
| 248 net_log)), |
247 ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)), | 249 ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)), |
248 enable_range_support_(true) { | 250 enable_range_support_(true) { |
249 } | 251 } |
250 | 252 |
251 HttpCache::HttpCache(HttpNetworkSession* session, | 253 HttpCache::HttpCache(HttpNetworkSession* session, |
252 BackendFactory* backend_factory) | 254 BackendFactory* backend_factory) |
253 : backend_factory_(backend_factory), | 255 : backend_factory_(backend_factory), |
254 temp_backend_(NULL), | 256 temp_backend_(NULL), |
255 building_backend_(false), | 257 building_backend_(false), |
256 mode_(NORMAL), | 258 mode_(NORMAL), |
(...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1041 // This could be an external caller or a transaction waiting on Start(). | 1043 // This could be an external caller or a transaction waiting on Start(). |
1042 pending_item->DoCallback(result, temp_backend_); | 1044 pending_item->DoCallback(result, temp_backend_); |
1043 pending_item->NotifyTransaction(result, NULL); | 1045 pending_item->NotifyTransaction(result, NULL); |
1044 } | 1046 } |
1045 | 1047 |
1046 DeletePendingOp(pending_op); | 1048 DeletePendingOp(pending_op); |
1047 building_backend_ = false; | 1049 building_backend_ = false; |
1048 } | 1050 } |
1049 | 1051 |
1050 } // namespace net | 1052 } // namespace net |
OLD | NEW |