| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc
e-loading | 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc
e-loading |
| 6 | 6 |
| 7 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 7 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 758 // the old handler (AsyncResourceHandler) may modify it in parallel via the | 758 // the old handler (AsyncResourceHandler) may modify it in parallel via the |
| 759 // ResourceDispatcherHostDelegate. | 759 // ResourceDispatcherHostDelegate. |
| 760 if (response->head.headers.get()) { | 760 if (response->head.headers.get()) { |
| 761 stream_info->response_headers = | 761 stream_info->response_headers = |
| 762 new net::HttpResponseHeaders(response->head.headers->raw_headers()); | 762 new net::HttpResponseHeaders(response->head.headers->raw_headers()); |
| 763 } | 763 } |
| 764 delegate_->OnStreamCreated(request, stream_info.Pass()); | 764 delegate_->OnStreamCreated(request, stream_info.Pass()); |
| 765 return handler.Pass(); | 765 return handler.Pass(); |
| 766 } | 766 } |
| 767 | 767 |
| 768 void ResourceDispatcherHostImpl::ClearSSLClientAuthHandlerForRequest( | |
| 769 net::URLRequest* request) { | |
| 770 ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(request); | |
| 771 if (info) { | |
| 772 ResourceLoader* loader = GetLoader(info->GetGlobalRequestID()); | |
| 773 if (loader) | |
| 774 loader->ClearSSLClientAuthHandler(); | |
| 775 } | |
| 776 } | |
| 777 | |
| 778 ResourceDispatcherHostLoginDelegate* | 768 ResourceDispatcherHostLoginDelegate* |
| 779 ResourceDispatcherHostImpl::CreateLoginDelegate( | 769 ResourceDispatcherHostImpl::CreateLoginDelegate( |
| 780 ResourceLoader* loader, | 770 ResourceLoader* loader, |
| 781 net::AuthChallengeInfo* auth_info) { | 771 net::AuthChallengeInfo* auth_info) { |
| 782 if (!delegate_) | 772 if (!delegate_) |
| 783 return NULL; | 773 return NULL; |
| 784 | 774 |
| 785 return delegate_->CreateLoginDelegate(auth_info, loader->request()); | 775 return delegate_->CreateLoginDelegate(auth_info, loader->request()); |
| 786 } | 776 } |
| 787 | 777 |
| (...skipping 1578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2366 | 2356 |
| 2367 // Add a flag to selectively bypass the data reduction proxy if the resource | 2357 // Add a flag to selectively bypass the data reduction proxy if the resource |
| 2368 // type is not an image. | 2358 // type is not an image. |
| 2369 if (request_data.resource_type != RESOURCE_TYPE_IMAGE) | 2359 if (request_data.resource_type != RESOURCE_TYPE_IMAGE) |
| 2370 load_flags |= net::LOAD_BYPASS_DATA_REDUCTION_PROXY; | 2360 load_flags |= net::LOAD_BYPASS_DATA_REDUCTION_PROXY; |
| 2371 | 2361 |
| 2372 return load_flags; | 2362 return load_flags; |
| 2373 } | 2363 } |
| 2374 | 2364 |
| 2375 } // namespace content | 2365 } // namespace content |
| OLD | NEW |