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

Side by Side Diff: webkit/glue/weburlloader_impl.cc

Issue 9235004: [Garbled Text][Infobar] Adding infobar to suggest turning on encoding detection. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase Created 8 years, 11 months 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
« no previous file with comments | « webkit/glue/resource_loader_bridge.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "webkit/glue/weburlloader_impl.h" 7 #include "webkit/glue/weburlloader_impl.h"
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 response->setWasNpnNegotiated(info.was_npn_negotiated); 162 response->setWasNpnNegotiated(info.was_npn_negotiated);
163 response->setWasAlternateProtocolAvailable( 163 response->setWasAlternateProtocolAvailable(
164 info.was_alternate_protocol_available); 164 info.was_alternate_protocol_available);
165 response->setWasFetchedViaProxy(info.was_fetched_via_proxy); 165 response->setWasFetchedViaProxy(info.was_fetched_via_proxy);
166 response->setRemoteIPAddress( 166 response->setRemoteIPAddress(
167 WebString::fromUTF8(info.socket_address.host())); 167 WebString::fromUTF8(info.socket_address.host()));
168 response->setRemotePort(info.socket_address.port()); 168 response->setRemotePort(info.socket_address.port());
169 response->setConnectionID(info.connection_id); 169 response->setConnectionID(info.connection_id);
170 response->setConnectionReused(info.connection_reused); 170 response->setConnectionReused(info.connection_reused);
171 response->setDownloadFilePath(FilePathToWebString(info.download_file_path)); 171 response->setDownloadFilePath(FilePathToWebString(info.download_file_path));
172 response->setNeedsEncodingDetection(info.needs_encoding_detection);
172 173
173 const ResourceLoadTimingInfo& timing_info = info.load_timing; 174 const ResourceLoadTimingInfo& timing_info = info.load_timing;
174 if (!timing_info.base_time.is_null()) { 175 if (!timing_info.base_time.is_null()) {
175 WebURLLoadTiming timing; 176 WebURLLoadTiming timing;
176 timing.initialize(); 177 timing.initialize();
177 timing.setRequestTime((timing_info.base_ticks - TimeTicks()).InSecondsF()); 178 timing.setRequestTime((timing_info.base_ticks - TimeTicks()).InSecondsF());
178 timing.setProxyStart(timing_info.proxy_start); 179 timing.setProxyStart(timing_info.proxy_start);
179 timing.setProxyEnd(timing_info.proxy_end); 180 timing.setProxyEnd(timing_info.proxy_end);
180 timing.setDNSStart(timing_info.dns_start); 181 timing.setDNSStart(timing_info.dns_start);
181 timing.setDNSEnd(timing_info.dns_end); 182 timing.setDNSEnd(timing_info.dns_end);
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 745
745 void WebURLLoaderImpl::setDefersLoading(bool value) { 746 void WebURLLoaderImpl::setDefersLoading(bool value) {
746 context_->SetDefersLoading(value); 747 context_->SetDefersLoading(value);
747 } 748 }
748 749
749 void WebURLLoaderImpl::UpdateRoutingId(int new_routing_id) { 750 void WebURLLoaderImpl::UpdateRoutingId(int new_routing_id) {
750 context_->UpdateRoutingId(new_routing_id); 751 context_->UpdateRoutingId(new_routing_id);
751 } 752 }
752 753
753 } // namespace webkit_glue 754 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/resource_loader_bridge.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698