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

Side by Side Diff: content/child/web_url_loader_impl.cc

Issue 691323002: Revert "Make the proxy server HostPortPair available in document_state so that" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 // An implementation of WebURLLoader in terms of ResourceLoaderBridge. 5 // An implementation of WebURLLoader in terms of ResourceLoaderBridge.
6 6
7 #include "content/child/web_url_loader_impl.h" 7 #include "content/child/web_url_loader_impl.h"
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 response->setServiceWorkerResponseType(info.response_type_via_service_worker); 841 response->setServiceWorkerResponseType(info.response_type_via_service_worker);
842 WebURLResponseExtraDataImpl* extra_data = 842 WebURLResponseExtraDataImpl* extra_data =
843 new WebURLResponseExtraDataImpl(info.npn_negotiated_protocol); 843 new WebURLResponseExtraDataImpl(info.npn_negotiated_protocol);
844 response->setExtraData(extra_data); 844 response->setExtraData(extra_data);
845 extra_data->set_was_fetched_via_spdy(info.was_fetched_via_spdy); 845 extra_data->set_was_fetched_via_spdy(info.was_fetched_via_spdy);
846 extra_data->set_was_npn_negotiated(info.was_npn_negotiated); 846 extra_data->set_was_npn_negotiated(info.was_npn_negotiated);
847 extra_data->set_was_alternate_protocol_available( 847 extra_data->set_was_alternate_protocol_available(
848 info.was_alternate_protocol_available); 848 info.was_alternate_protocol_available);
849 extra_data->set_connection_info(info.connection_info); 849 extra_data->set_connection_info(info.connection_info);
850 extra_data->set_was_fetched_via_proxy(info.was_fetched_via_proxy); 850 extra_data->set_was_fetched_via_proxy(info.was_fetched_via_proxy);
851 extra_data->set_proxy_server(info.proxy_server);
852 851
853 // If there's no received headers end time, don't set load timing. This is 852 // If there's no received headers end time, don't set load timing. This is
854 // the case for non-HTTP requests, requests that don't go over the wire, and 853 // the case for non-HTTP requests, requests that don't go over the wire, and
855 // certain error cases. 854 // certain error cases.
856 if (!info.load_timing.receive_headers_end.is_null()) { 855 if (!info.load_timing.receive_headers_end.is_null()) {
857 WebURLLoadTiming timing; 856 WebURLLoadTiming timing;
858 PopulateURLLoadTiming(info.load_timing, &timing); 857 PopulateURLLoadTiming(info.load_timing, &timing);
859 const TimeTicks kNullTicks; 858 const TimeTicks kNullTicks;
860 timing.setServiceWorkerFetchStart( 859 timing.setServiceWorkerFetchStart(
861 (info.service_worker_fetch_start - kNullTicks).InSecondsF()); 860 (info.service_worker_fetch_start - kNullTicks).InSecondsF());
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
982 int intra_priority_value) { 981 int intra_priority_value) {
983 context_->DidChangePriority(new_priority, intra_priority_value); 982 context_->DidChangePriority(new_priority, intra_priority_value);
984 } 983 }
985 984
986 bool WebURLLoaderImpl::attachThreadedDataReceiver( 985 bool WebURLLoaderImpl::attachThreadedDataReceiver(
987 blink::WebThreadedDataReceiver* threaded_data_receiver) { 986 blink::WebThreadedDataReceiver* threaded_data_receiver) {
988 return context_->AttachThreadedDataReceiver(threaded_data_receiver); 987 return context_->AttachThreadedDataReceiver(threaded_data_receiver);
989 } 988 }
990 989
991 } // namespace content 990 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/loader/resource_loader.cc ('k') | content/child/weburlresponse_extradata_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698