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

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

Issue 517853004: Move ResourceResponseHead::error_code to SyncLoadResult. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
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 #include "content/browser/loader/resource_loader.h" 5 #include "content/browser/loader/resource_loader.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 24 matching lines...) Expand all
35 35
36 using base::TimeDelta; 36 using base::TimeDelta;
37 using base::TimeTicks; 37 using base::TimeTicks;
38 38
39 namespace content { 39 namespace content {
40 namespace { 40 namespace {
41 41
42 void PopulateResourceResponse(ResourceRequestInfoImpl* info, 42 void PopulateResourceResponse(ResourceRequestInfoImpl* info,
43 net::URLRequest* request, 43 net::URLRequest* request,
44 ResourceResponse* response) { 44 ResourceResponse* response) {
45 response->head.error_code = request->status().error();
46 response->head.request_time = request->request_time(); 45 response->head.request_time = request->request_time();
47 response->head.response_time = request->response_time(); 46 response->head.response_time = request->response_time();
48 response->head.headers = request->response_headers(); 47 response->head.headers = request->response_headers();
49 request->GetCharset(&response->head.charset); 48 request->GetCharset(&response->head.charset);
50 response->head.content_length = request->GetExpectedContentSize(); 49 response->head.content_length = request->GetExpectedContentSize();
51 request->GetMimeType(&response->head.mime_type); 50 request->GetMimeType(&response->head.mime_type);
52 net::HttpResponseInfo response_info = request->response_info(); 51 net::HttpResponseInfo response_info = request->response_info();
53 response->head.was_fetched_via_spdy = response_info.was_fetched_via_spdy; 52 response->head.was_fetched_via_spdy = response_info.was_fetched_via_spdy;
54 response->head.was_npn_negotiated = response_info.was_npn_negotiated; 53 response->head.was_npn_negotiated = response_info.was_npn_negotiated;
55 response->head.npn_negotiated_protocol = 54 response->head.npn_negotiated_protocol =
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 case net::URLRequestStatus::FAILED: 703 case net::URLRequestStatus::FAILED:
705 status = STATUS_UNDEFINED; 704 status = STATUS_UNDEFINED;
706 break; 705 break;
707 } 706 }
708 707
709 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); 708 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX);
710 } 709 }
711 } 710 }
712 711
713 } // namespace content 712 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/loader/redirect_to_file_resource_handler.cc ('k') | content/child/resource_dispatcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698