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/renderer_host/resource_dispatcher_host_impl.h" | 7 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h" |
8 | 8 |
9 #include <set> | 9 #include <set> |
10 #include <vector> | 10 #include <vector> |
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
786 return; | 786 return; |
787 } | 787 } |
788 | 788 |
789 // Construct the request. | 789 // Construct the request. |
790 net::URLRequest* request; | 790 net::URLRequest* request; |
791 if (deferred_request) { | 791 if (deferred_request) { |
792 request = deferred_request; | 792 request = deferred_request; |
793 } else { | 793 } else { |
794 request = new net::URLRequest(request_data.url, this); | 794 request = new net::URLRequest(request_data.url, this); |
795 request->set_method(request_data.method); | 795 request->set_method(request_data.method); |
| 796 request->set_virtual_url(request_data.virtual_url); |
796 request->set_first_party_for_cookies(request_data.first_party_for_cookies); | 797 request->set_first_party_for_cookies(request_data.first_party_for_cookies); |
797 request->set_referrer(referrer.url.spec()); | 798 request->set_referrer(referrer.url.spec()); |
798 net::HttpRequestHeaders headers; | 799 net::HttpRequestHeaders headers; |
799 headers.AddHeadersFromString(request_data.headers); | 800 headers.AddHeadersFromString(request_data.headers); |
800 request->SetExtraRequestHeaders(headers); | 801 request->SetExtraRequestHeaders(headers); |
801 } | 802 } |
802 | 803 |
803 int load_flags = request_data.load_flags; | 804 int load_flags = request_data.load_flags; |
804 // Although EV status is irrelevant to sub-frames and sub-resources, we have | 805 // Although EV status is irrelevant to sub-frames and sub-resources, we have |
805 // to perform EV certificate verification on all resources because an HTTP | 806 // to perform EV certificate verification on all resources because an HTTP |
(...skipping 1484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2290 return allow_cross_origin_auth_prompt_; | 2291 return allow_cross_origin_auth_prompt_; |
2291 } | 2292 } |
2292 | 2293 |
2293 bool ResourceDispatcherHostImpl::IsTransferredNavigation( | 2294 bool ResourceDispatcherHostImpl::IsTransferredNavigation( |
2294 const GlobalRequestID& transferred_request_id) const { | 2295 const GlobalRequestID& transferred_request_id) const { |
2295 return transferred_navigations_.find(transferred_request_id) != | 2296 return transferred_navigations_.find(transferred_request_id) != |
2296 transferred_navigations_.end(); | 2297 transferred_navigations_.end(); |
2297 } | 2298 } |
2298 | 2299 |
2299 } // namespace content | 2300 } // namespace content |
OLD | NEW |