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

Side by Side Diff: content/browser/renderer_host/resource_dispatcher_host.cc

Issue 9413038: SPDY - chrome:loadtimes() should display negotiated NPN protocol. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 | Annotate | Revision Log
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/renderer_host/resource_dispatcher_host.h" 7 #include "content/browser/renderer_host/resource_dispatcher_host.h"
8 8
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 response->status = request->status(); 204 response->status = request->status();
205 response->request_time = request->request_time(); 205 response->request_time = request->request_time();
206 response->response_time = request->response_time(); 206 response->response_time = request->response_time();
207 response->headers = request->response_headers(); 207 response->headers = request->response_headers();
208 request->GetCharset(&response->charset); 208 request->GetCharset(&response->charset);
209 response->content_length = request->GetExpectedContentSize(); 209 response->content_length = request->GetExpectedContentSize();
210 request->GetMimeType(&response->mime_type); 210 request->GetMimeType(&response->mime_type);
211 net::HttpResponseInfo response_info = request->response_info(); 211 net::HttpResponseInfo response_info = request->response_info();
212 response->was_fetched_via_spdy = response_info.was_fetched_via_spdy; 212 response->was_fetched_via_spdy = response_info.was_fetched_via_spdy;
213 response->was_npn_negotiated = response_info.was_npn_negotiated; 213 response->was_npn_negotiated = response_info.was_npn_negotiated;
214 response->npn_negotiated_protocol = response_info.npn_negotiated_protocol;
214 response->was_fetched_via_proxy = request->was_fetched_via_proxy(); 215 response->was_fetched_via_proxy = request->was_fetched_via_proxy();
215 response->socket_address = request->GetSocketAddress(); 216 response->socket_address = request->GetSocketAddress();
216 appcache::AppCacheInterceptor::GetExtraResponseInfo( 217 appcache::AppCacheInterceptor::GetExtraResponseInfo(
217 request, 218 request,
218 &response->appcache_id, 219 &response->appcache_id,
219 &response->appcache_manifest_url); 220 &response->appcache_manifest_url);
220 } 221 }
221 222
222 void RemoveDownloadFileFromChildSecurityPolicy(int child_id, 223 void RemoveDownloadFileFromChildSecurityPolicy(int child_id,
223 const FilePath& path) { 224 const FilePath& path) {
(...skipping 2074 matching lines...) Expand 10 before | Expand all | Expand 10 after
2298 scoped_refptr<ResourceHandler> transferred_resource_handler( 2299 scoped_refptr<ResourceHandler> transferred_resource_handler(
2299 new DoomedResourceHandler(info->resource_handler())); 2300 new DoomedResourceHandler(info->resource_handler()));
2300 info->set_resource_handler(transferred_resource_handler.get()); 2301 info->set_resource_handler(transferred_resource_handler.get());
2301 } 2302 }
2302 2303
2303 bool ResourceDispatcherHost::IsTransferredNavigation( 2304 bool ResourceDispatcherHost::IsTransferredNavigation(
2304 const content::GlobalRequestID& transferred_request_id) const { 2305 const content::GlobalRequestID& transferred_request_id) const {
2305 return transferred_navigations_.find(transferred_request_id) != 2306 return transferred_navigations_.find(transferred_request_id) !=
2306 transferred_navigations_.end(); 2307 transferred_navigations_.end();
2307 } 2308 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698