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

Side by Side Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 755933002: Revert of "Remove SSLClientAuthHandler's RDH dependency." (https://codereview.chromium.org/59687300… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one other VLOG -> DVLOG conversion Created 6 years 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 unified diff | Download patch
OLDNEW
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
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
768 ResourceDispatcherHostLoginDelegate* 778 ResourceDispatcherHostLoginDelegate*
769 ResourceDispatcherHostImpl::CreateLoginDelegate( 779 ResourceDispatcherHostImpl::CreateLoginDelegate(
770 ResourceLoader* loader, 780 ResourceLoader* loader,
771 net::AuthChallengeInfo* auth_info) { 781 net::AuthChallengeInfo* auth_info) {
772 if (!delegate_) 782 if (!delegate_)
773 return NULL; 783 return NULL;
774 784
775 return delegate_->CreateLoginDelegate(auth_info, loader->request()); 785 return delegate_->CreateLoginDelegate(auth_info, loader->request());
776 } 786 }
777 787
(...skipping 1578 matching lines...) Expand 10 before | Expand all | Expand 10 after
2356 2366
2357 // Add a flag to selectively bypass the data reduction proxy if the resource 2367 // Add a flag to selectively bypass the data reduction proxy if the resource
2358 // type is not an image. 2368 // type is not an image.
2359 if (request_data.resource_type != RESOURCE_TYPE_IMAGE) 2369 if (request_data.resource_type != RESOURCE_TYPE_IMAGE)
2360 load_flags |= net::LOAD_BYPASS_DATA_REDUCTION_PROXY; 2370 load_flags |= net::LOAD_BYPASS_DATA_REDUCTION_PROXY;
2361 2371
2362 return load_flags; 2372 return load_flags;
2363 } 2373 }
2364 2374
2365 } // namespace content 2375 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.h ('k') | content/browser/loader/resource_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698