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

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

Issue 12680003: net: split net/ssl out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 #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.h" 8 #include "base/message_loop.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "content/browser/child_process_security_policy_impl.h" 10 #include "content/browser/child_process_security_policy_impl.h"
11 #include "content/browser/loader/doomed_resource_handler.h" 11 #include "content/browser/loader/doomed_resource_handler.h"
12 #include "content/browser/loader/resource_loader_delegate.h" 12 #include "content/browser/loader/resource_loader_delegate.h"
13 #include "content/browser/loader/resource_request_info_impl.h" 13 #include "content/browser/loader/resource_request_info_impl.h"
14 #include "content/browser/ssl/ssl_client_auth_handler.h" 14 #include "content/browser/ssl/ssl_client_auth_handler.h"
15 #include "content/browser/ssl/ssl_manager.h" 15 #include "content/browser/ssl/ssl_manager.h"
16 #include "content/common/ssl_status_serialization.h" 16 #include "content/common/ssl_status_serialization.h"
17 #include "content/public/browser/cert_store.h" 17 #include "content/public/browser/cert_store.h"
18 #include "content/public/browser/resource_dispatcher_host_login_delegate.h" 18 #include "content/public/browser/resource_dispatcher_host_login_delegate.h"
19 #include "content/public/browser/site_instance.h" 19 #include "content/public/browser/site_instance.h"
20 #include "content/public/common/content_client.h" 20 #include "content/public/common/content_client.h"
21 #include "content/public/common/content_switches.h" 21 #include "content/public/common/content_switches.h"
22 #include "content/public/common/resource_response.h" 22 #include "content/public/common/resource_response.h"
23 #include "content/public/common/url_constants.h" 23 #include "content/public/common/url_constants.h"
24 #include "net/base/client_cert_store.h" 24 #include "net/base/client_cert_store.h"
wtc 2013/03/12 23:14:37 Did you miss net/base/client_cert_store.h? It seem
Paweł Hajdan Jr. 2013/03/13 22:59:52 Done.
25 #include "net/base/client_cert_store_impl.h"
26 #include "net/base/load_flags.h" 25 #include "net/base/load_flags.h"
27 #include "net/http/http_response_headers.h" 26 #include "net/http/http_response_headers.h"
27 #include "net/ssl/client_cert_store_impl.h"
28 #include "webkit/appcache/appcache_interceptor.h" 28 #include "webkit/appcache/appcache_interceptor.h"
29 29
30 using base::TimeDelta; 30 using base::TimeDelta;
31 using base::TimeTicks; 31 using base::TimeTicks;
32 32
33 namespace content { 33 namespace content {
34 namespace { 34 namespace {
35 35
36 void PopulateResourceResponse(net::URLRequest* request, 36 void PopulateResourceResponse(net::URLRequest* request,
37 ResourceResponse* response) { 37 ResourceResponse* response) {
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 // we resume. 646 // we resume.
647 deferred_stage_ = DEFERRED_FINISH; 647 deferred_stage_ = DEFERRED_FINISH;
648 } 648 }
649 } 649 }
650 650
651 void ResourceLoader::CallDidFinishLoading() { 651 void ResourceLoader::CallDidFinishLoading() {
652 delegate_->DidFinishLoading(this); 652 delegate_->DidFinishLoading(this);
653 } 653 }
654 654
655 } // namespace content 655 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698