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

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 18121007: *WIP* Store NSS slots per profile. Move keygen to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more refactoring Created 7 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/net/nss_context_linux.cc ('k') | chrome/browser/resources/options/certificate_manager.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index ef1bda1a6125831660e20cccc82ae06e303d429c..60b1113daf75a28a6a2e26869019511345252067 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -101,6 +101,7 @@
#include "chromeos/settings/cros_settings_names.h"
#include "crypto/nss_util.h"
#include "crypto/nss_util_internal.h"
+#include "net/ssl/client_cert_store_chromeos.h"
#endif // defined(OS_CHROMEOS)
#if defined(USE_NSS)
@@ -832,7 +833,12 @@ net::URLRequestContext* ProfileIOData::ResourceContext::GetRequestContext() {
scoped_ptr<net::ClientCertStore>
ProfileIOData::ResourceContext::CreateClientCertStore() {
#if !defined(USE_OPENSSL)
+#if defined(OS_CHROMEOS)
+ scoped_ptr<net::ClientCertStoreChromeOS> store(
+ new net::ClientCertStoreChromeOS(io_data_->username_hash()));
+#else
scoped_ptr<net::ClientCertStoreImpl> store(new net::ClientCertStoreImpl());
+#endif
#if defined(USE_NSS)
store->set_password_delegate_factory(
base::Bind(&CreateCryptoModuleBlockingPasswordDelegate,
« no previous file with comments | « chrome/browser/net/nss_context_linux.cc ('k') | chrome/browser/resources/options/certificate_manager.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698