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

Unified Diff: chrome/browser/chromeos/platform_keys/platform_keys_nss.cc

Issue 1274143002: ClientCertStoreChromeOS: support additional non-platform certs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Refactored to suggested pulling of certificates. Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/platform_keys/platform_keys_nss.cc
diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc b/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc
index a8737a76a2e7a4ae16096e2cacb1a24dc0ff290f..552d551ceddeedfd9117a498f48133b9fd6b89c1 100644
--- a/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc
+++ b/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc
@@ -22,6 +22,7 @@
#include "base/threading/worker_pool.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_chromeos.h"
+#include "chrome/browser/chromeos/certificate_provider/certificate_provider.h"
#include "chrome/browser/chromeos/net/client_cert_filter_chromeos.h"
#include "chrome/browser/chromeos/net/client_cert_store_chromeos.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
@@ -551,6 +552,7 @@ void DidSelectCertificatesOnIOThread(
void SelectCertificatesOnIOThread(scoped_ptr<SelectCertificatesState> state) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
state->cert_store_.reset(new chromeos::ClientCertStoreChromeOS(
+ nullptr, // no additional certs
davidben 2015/08/14 21:49:16 "No additional provider." perhaps?
pneubeck (no reviews) 2015/08/17 12:01:32 Done.
make_scoped_ptr(new chromeos::ClientCertFilterChromeOS(
state->use_system_key_slot_, state->username_hash_)),
chromeos::ClientCertStoreChromeOS::PasswordDelegateFactory()));

Powered by Google App Engine
This is Rietveld 408576698