OLD | NEW |
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 "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.
h" | 5 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.
h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 #include "content/public/browser/resource_dispatcher_host.h" | 61 #include "content/public/browser/resource_dispatcher_host.h" |
62 #include "content/public/browser/resource_request_info.h" | 62 #include "content/public/browser/resource_request_info.h" |
63 #include "content/public/browser/service_worker_context.h" | 63 #include "content/public/browser/service_worker_context.h" |
64 #include "content/public/browser/stream_info.h" | 64 #include "content/public/browser/stream_info.h" |
65 #include "content/public/browser/web_contents.h" | 65 #include "content/public/browser/web_contents.h" |
66 #include "content/public/common/resource_response.h" | 66 #include "content/public/common/resource_response.h" |
67 #include "net/base/load_flags.h" | 67 #include "net/base/load_flags.h" |
68 #include "net/base/load_timing_info.h" | 68 #include "net/base/load_timing_info.h" |
69 #include "net/base/request_priority.h" | 69 #include "net/base/request_priority.h" |
70 #include "net/http/http_response_headers.h" | 70 #include "net/http/http_response_headers.h" |
| 71 #include "net/ssl/client_cert_store.h" |
71 #include "net/url_request/url_request.h" | 72 #include "net/url_request/url_request.h" |
72 | 73 |
73 #if !defined(DISABLE_NACL) | 74 #if !defined(DISABLE_NACL) |
74 #include "chrome/browser/component_updater/pnacl_component_installer.h" | 75 #include "chrome/browser/component_updater/pnacl_component_installer.h" |
75 #endif | 76 #endif |
76 | 77 |
77 #if defined(ENABLE_EXTENSIONS) | 78 #if defined(ENABLE_EXTENSIONS) |
78 #include "chrome/browser/apps/app_url_redirector.h" | 79 #include "chrome/browser/apps/app_url_redirector.h" |
79 #include "chrome/browser/extensions/api/streams_private/streams_private_api.h" | 80 #include "chrome/browser/extensions/api/streams_private/streams_private_api.h" |
80 #include "chrome/browser/extensions/user_script_listener.h" | 81 #include "chrome/browser/extensions/user_script_listener.h" |
(...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
842 data_reduction_proxy::DataReductionProxyData* data_reduction_proxy_data = | 843 data_reduction_proxy::DataReductionProxyData* data_reduction_proxy_data = |
843 data_reduction_proxy::DataReductionProxyData::GetData(*request); | 844 data_reduction_proxy::DataReductionProxyData::GetData(*request); |
844 // DeepCopy the DataReductionProxyData from the URLRequest to prevent the | 845 // DeepCopy the DataReductionProxyData from the URLRequest to prevent the |
845 // URLRequest and DataReductionProxyData from both having ownership of the | 846 // URLRequest and DataReductionProxyData from both having ownership of the |
846 // same object. This copy will be shortlived as it will be deep copied again | 847 // same object. This copy will be shortlived as it will be deep copied again |
847 // when content makes a clone of NavigationData for the UI thread. | 848 // when content makes a clone of NavigationData for the UI thread. |
848 if (data_reduction_proxy_data) | 849 if (data_reduction_proxy_data) |
849 data->SetDataReductionProxyData(data_reduction_proxy_data->DeepCopy()); | 850 data->SetDataReductionProxyData(data_reduction_proxy_data->DeepCopy()); |
850 return data; | 851 return data; |
851 } | 852 } |
| 853 |
| 854 std::unique_ptr<net::ClientCertStore> |
| 855 ChromeResourceDispatcherHostDelegate::CreateClientCertStore( |
| 856 content::ResourceContext* resource_context) { |
| 857 return ProfileIOData::FromResourceContext(resource_context)-> |
| 858 CreateClientCertStore(); |
| 859 } |
OLD | NEW |