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

Side by Side Diff: content/browser/resource_context_impl.cc

Issue 384413004: Remove default key slot from KeygenHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed compilation, addressed suggestions. Created 6 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/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"
11 #include "content/browser/loader/resource_request_info_impl.h" 11 #include "content/browser/loader/resource_request_info_impl.h"
12 #include "content/browser/streams/stream_context.h" 12 #include "content/browser/streams/stream_context.h"
13 #include "content/browser/webui/url_data_manager_backend.h" 13 #include "content/browser/webui/url_data_manager_backend.h"
14 #include "content/public/browser/browser_context.h" 14 #include "content/public/browser/browser_context.h"
15 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
16 #include "net/base/keygen_handler.h"
17 #include "net/ssl/client_cert_store.h" 16 #include "net/ssl/client_cert_store.h"
18 17
19 using base::UserDataAdapter; 18 using base::UserDataAdapter;
20 19
21 namespace content { 20 namespace content {
22 21
23 namespace { 22 namespace {
24 23
25 // Key names on ResourceContext. 24 // Key names on ResourceContext.
26 const char kBlobStorageContextKeyName[] = "content_blob_storage_context"; 25 const char kBlobStorageContextKeyName[] = "content_blob_storage_context";
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 } 61 }
63 62
64 ResourceContext::SaltCallback ResourceContext::GetMediaDeviceIDSalt() { 63 ResourceContext::SaltCallback ResourceContext::GetMediaDeviceIDSalt() {
65 return base::Bind(&ReturnEmptySalt); 64 return base::Bind(&ReturnEmptySalt);
66 } 65 }
67 66
68 scoped_ptr<net::ClientCertStore> ResourceContext::CreateClientCertStore() { 67 scoped_ptr<net::ClientCertStore> ResourceContext::CreateClientCertStore() {
69 return scoped_ptr<net::ClientCertStore>(); 68 return scoped_ptr<net::ClientCertStore>();
70 } 69 }
71 70
72 void ResourceContext::CreateKeygenHandler(
73 uint32 key_size_in_bits,
74 const std::string& challenge_string,
75 const GURL& url,
76 const base::Callback<void(scoped_ptr<net::KeygenHandler>)>& callback) {
77 callback.Run(make_scoped_ptr(
78 new net::KeygenHandler(key_size_in_bits, challenge_string, url)));
79 }
80
81 ChromeBlobStorageContext* GetChromeBlobStorageContextForResourceContext( 71 ChromeBlobStorageContext* GetChromeBlobStorageContextForResourceContext(
82 ResourceContext* resource_context) { 72 ResourceContext* resource_context) {
83 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 73 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
84 return UserDataAdapter<ChromeBlobStorageContext>::Get( 74 return UserDataAdapter<ChromeBlobStorageContext>::Get(
85 resource_context, kBlobStorageContextKeyName); 75 resource_context, kBlobStorageContextKeyName);
86 } 76 }
87 77
88 StreamContext* GetStreamContextForResourceContext( 78 StreamContext* GetStreamContextForResourceContext(
89 ResourceContext* resource_context) { 79 ResourceContext* resource_context) {
90 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 80 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // store a non-owning pointer here. 120 // store a non-owning pointer here.
131 resource_context->SetUserData( 121 resource_context->SetUserData(
132 kHostZoomMapKeyName, 122 kHostZoomMapKeyName,
133 new NonOwningZoomData( 123 new NonOwningZoomData(
134 HostZoomMap::GetForBrowserContext(browser_context))); 124 HostZoomMap::GetForBrowserContext(browser_context)));
135 125
136 resource_context->DetachUserDataThread(); 126 resource_context->DetachUserDataThread();
137 } 127 }
138 128
139 } // namespace content 129 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698