chrome/browser/profiles/profile_io_data.cc - Issue 1274143002: ClientCertStoreChromeOS: support additional non-platform certs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1274143002: ClientCertStoreChromeOS: support additional non-platform certs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased. 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

« chrome/browser/chromeos/net/client_cert_store_chromeos.cc ('K') | « chrome/browser/chromeos/platform_keys/platform_keys_nss.cc ('k') | net/ssl/client_cert_store_nss.h » ('j') | net/ssl/client_cert_store_nss.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 a8f67ea8144871156e3bc8bcb7dd2687be1ab299..d71b94a5a61739e575c2561b17ed5cf29bad0701 100644

--- a/chrome/browser/profiles/profile_io_data.cc

+++ b/chrome/browser/profiles/profile_io_data.cc

@@ -114,6 +114,7 @@

#endif // defined(OS_ANDROID)

#if defined(OS_CHROMEOS)

+#include "chrome/browser/chromeos/certificate_provider/certificate_provider.h"

mmenke 2015/08/22 17:21:54 If you're just passing in a NULL certificate provi

pneubeck (no reviews) 2015/08/23 19:31:31 The argument is a scoped_ptr<T>, that's why the fu

#include "chrome/browser/chromeos/fileapi/external_file_protocol_handler.h"

#include "chrome/browser/chromeos/login/startup_utils.h"

#include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"

@@ -940,6 +941,7 @@ ProfileIOData::ResourceContext::CreateClientCertStore() {

return io_data_->client_cert_store_factory_.Run();

#if defined(OS_CHROMEOS)

return scoped_ptr<net::ClientCertStore>(new chromeos::ClientCertStoreChromeOS(

+ nullptr, // no additional provider

make_scoped_ptr(new chromeos::ClientCertFilterChromeOS(

io_data_->use_system_key_slot(), io_data_->username_hash())),

base::Bind(&CreateCryptoModuleBlockingPasswordDelegate,