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

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

Issue 10416003: RefCounted types should not have public destructors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: One more fix Created 8 years, 5 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 #include "content/browser/renderer_host/resource_loader.h" 5 #include "content/browser/renderer_host/resource_loader.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/time.h" 8 #include "base/time.h"
9 #include "content/browser/child_process_security_policy_impl.h" 9 #include "content/browser/child_process_security_policy_impl.h"
10 #include "content/browser/renderer_host/doomed_resource_handler.h" 10 #include "content/browser/renderer_host/doomed_resource_handler.h"
(...skipping 10 matching lines...) Expand all
21 #include "webkit/appcache/appcache_interceptor.h" 21 #include "webkit/appcache/appcache_interceptor.h"
22 22
23 using base::TimeDelta; 23 using base::TimeDelta;
24 using base::TimeTicks; 24 using base::TimeTicks;
25 25
26 namespace content { 26 namespace content {
27 namespace { 27 namespace {
28 28
29 void PopulateResourceResponse(net::URLRequest* request, 29 void PopulateResourceResponse(net::URLRequest* request,
30 ResourceResponse* response) { 30 ResourceResponse* response) {
31 response->status = request->status(); 31 response->head.status = request->status();
32 response->request_time = request->request_time(); 32 response->head.request_time = request->request_time();
33 response->response_time = request->response_time(); 33 response->head.response_time = request->response_time();
34 response->headers = request->response_headers(); 34 response->head.headers = request->response_headers();
35 request->GetCharset(&response->charset); 35 request->GetCharset(&response->head.charset);
36 response->content_length = request->GetExpectedContentSize(); 36 response->head.content_length = request->GetExpectedContentSize();
37 request->GetMimeType(&response->mime_type); 37 request->GetMimeType(&response->head.mime_type);
38 net::HttpResponseInfo response_info = request->response_info(); 38 net::HttpResponseInfo response_info = request->response_info();
39 response->was_fetched_via_spdy = response_info.was_fetched_via_spdy; 39 response->head.was_fetched_via_spdy = response_info.was_fetched_via_spdy;
40 response->was_npn_negotiated = response_info.was_npn_negotiated; 40 response->head.was_npn_negotiated = response_info.was_npn_negotiated;
41 response->npn_negotiated_protocol = response_info.npn_negotiated_protocol; 41 response->head.npn_negotiated_protocol =
42 response->was_fetched_via_proxy = request->was_fetched_via_proxy(); 42 response_info.npn_negotiated_protocol;
43 response->socket_address = request->GetSocketAddress(); 43 response->head.was_fetched_via_proxy = request->was_fetched_via_proxy();
44 response->head.socket_address = request->GetSocketAddress();
44 appcache::AppCacheInterceptor::GetExtraResponseInfo( 45 appcache::AppCacheInterceptor::GetExtraResponseInfo(
45 request, 46 request,
46 &response->appcache_id, 47 &response->head.appcache_id,
47 &response->appcache_manifest_url); 48 &response->head.appcache_manifest_url);
48 } 49 }
49 50
50 } // namespace 51 } // namespace
51 52
52 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request, 53 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request,
53 scoped_ptr<ResourceHandler> handler, 54 scoped_ptr<ResourceHandler> handler,
54 ResourceLoaderDelegate* delegate) 55 ResourceLoaderDelegate* delegate)
55 : deferred_stage_(DEFERRED_NONE), 56 : deferred_stage_(DEFERRED_NONE),
56 request_(request.Pass()), 57 request_(request.Pass()),
57 handler_(handler.Pass()), 58 handler_(handler.Pass()),
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 bool ResourceLoader::CompleteResponseStarted() { 485 bool ResourceLoader::CompleteResponseStarted() {
485 ResourceRequestInfoImpl* info = GetRequestInfo(); 486 ResourceRequestInfoImpl* info = GetRequestInfo();
486 487
487 scoped_refptr<ResourceResponse> response(new ResourceResponse()); 488 scoped_refptr<ResourceResponse> response(new ResourceResponse());
488 PopulateResourceResponse(request_.get(), response); 489 PopulateResourceResponse(request_.get(), response);
489 490
490 if (request_->ssl_info().cert) { 491 if (request_->ssl_info().cert) {
491 int cert_id = 492 int cert_id =
492 CertStore::GetInstance()->StoreCert(request_->ssl_info().cert, 493 CertStore::GetInstance()->StoreCert(request_->ssl_info().cert,
493 info->GetChildID()); 494 info->GetChildID());
494 response->security_info = SerializeSecurityInfo( 495 response->head.security_info = SerializeSecurityInfo(
495 cert_id, 496 cert_id,
496 request_->ssl_info().cert_status, 497 request_->ssl_info().cert_status,
497 request_->ssl_info().security_bits, 498 request_->ssl_info().security_bits,
498 request_->ssl_info().connection_status); 499 request_->ssl_info().connection_status);
499 } else { 500 } else {
500 // We should not have any SSL state. 501 // We should not have any SSL state.
501 DCHECK(!request_->ssl_info().cert_status && 502 DCHECK(!request_->ssl_info().cert_status &&
502 request_->ssl_info().security_bits == -1 && 503 request_->ssl_info().security_bits == -1 &&
503 !request_->ssl_info().connection_status); 504 !request_->ssl_info().connection_status);
504 } 505 }
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 } else { 640 } else {
640 OnResponseStarted(request_.get()); 641 OnResponseStarted(request_.get());
641 } 642 }
642 } 643 }
643 644
644 void ResourceLoader::CallDidFinishLoading() { 645 void ResourceLoader::CallDidFinishLoading() {
645 delegate_->DidFinishLoading(this); 646 delegate_->DidFinishLoading(this);
646 } 647 }
647 648
648 } // namespace content 649 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698