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 "content/browser/resource_context_impl.h" | 5 #include "content/browser/resource_context_impl.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/browser/fileapi/chrome_blob_storage_context.h" | 8 #include "content/browser/fileapi/chrome_blob_storage_context.h" |
9 #include "content/browser/host_zoom_map_impl.h" | 9 #include "content/browser/host_zoom_map_impl.h" |
10 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 10 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 ResourceDispatcherHostImpl* rdhi = ResourceDispatcherHostImpl::Get(); | 48 ResourceDispatcherHostImpl* rdhi = ResourceDispatcherHostImpl::Get(); |
49 if (rdhi) { | 49 if (rdhi) { |
50 rdhi->CancelRequestsForContext(this); | 50 rdhi->CancelRequestsForContext(this); |
51 rdhi->RemoveResourceContext(this); | 51 rdhi->RemoveResourceContext(this); |
52 } | 52 } |
53 | 53 |
54 // In some tests this object is destructed on UI thread. | 54 // In some tests this object is destructed on UI thread. |
55 DetachUserDataThread(); | 55 DetachUserDataThread(); |
56 } | 56 } |
57 | 57 |
58 scoped_ptr<net::ClientCertStore> ResourceContext::CreateClientCertStore() { | 58 scoped_ptr<net::ClientCertStore> ResourceContext::CreateClientCertStore( |
| 59 const std::string& host_and_port) { |
59 return scoped_ptr<net::ClientCertStore>(); | 60 return scoped_ptr<net::ClientCertStore>(); |
60 } | 61 } |
61 | 62 |
62 ChromeBlobStorageContext* GetChromeBlobStorageContextForResourceContext( | 63 ChromeBlobStorageContext* GetChromeBlobStorageContextForResourceContext( |
63 ResourceContext* resource_context) { | 64 ResourceContext* resource_context) { |
64 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 65 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
65 return UserDataAdapter<ChromeBlobStorageContext>::Get( | 66 return UserDataAdapter<ChromeBlobStorageContext>::Get( |
66 resource_context, kBlobStorageContextKeyName); | 67 resource_context, kBlobStorageContextKeyName); |
67 } | 68 } |
68 | 69 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 // store a non-owning pointer here. | 109 // store a non-owning pointer here. |
109 resource_context->SetUserData( | 110 resource_context->SetUserData( |
110 kHostZoomMapKeyName, | 111 kHostZoomMapKeyName, |
111 new NonOwningZoomData( | 112 new NonOwningZoomData( |
112 HostZoomMap::GetForBrowserContext(browser_context))); | 113 HostZoomMap::GetForBrowserContext(browser_context))); |
113 | 114 |
114 resource_context->DetachUserDataThread(); | 115 resource_context->DetachUserDataThread(); |
115 } | 116 } |
116 | 117 |
117 } // namespace content | 118 } // namespace content |
OLD | NEW |