chrome/browser/ui/crypto_module_password_dialog_nss.cc - Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/crypto_module_password_dialog_nss.cc

Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync to r235279 Created 7 years, 1 month 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

« chrome/browser/ui/crypto_module_delegate_nss.cc ('K') | « chrome/browser/ui/crypto_module_password_dialog_nss.h ('k') | chrome/browser/ui/crypto_module_password_dialog_openssl.cc » ('j') | crypto/nss_crypto_module_delegate.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "chrome/browser/ui/crypto_module_password_dialog.h"	5 #include "chrome/browser/ui/crypto_module_password_dialog_nss.h"

6	6

7 #include <pk11pub.h>	7 #include <pk11pub.h>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/logging.h"	10 #include "base/logging.h"

11 #include "content/public/browser/browser_thread.h"	11 #include "content/public/browser/browser_thread.h"

12 #include "net/base/crypto_module.h"	12 #include "net/base/crypto_module.h"

13 #include "net/cert/x509_certificate.h"	13 #include "net/cert/x509_certificate.h"

14	14

15 #if defined(OS_CHROMEOS)	15 #if defined(OS_CHROMEOS)

(...skipping 144 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
160 const std::string& host,	160 const std::string& host,

161 gfx::NativeWindow parent,	161 gfx::NativeWindow parent,

162 const base::Closure& callback) {	162 const base::Closure& callback) {

163 net::CryptoModuleList modules;	163 net::CryptoModuleList modules;

164 modules.push_back(net::CryptoModule::CreateFromHandle(	164 modules.push_back(net::CryptoModule::CreateFromHandle(

165 cert->os_cert_handle()->slot));	165 cert->os_cert_handle()->slot));

166 UnlockSlotsIfNecessary(modules, reason, host, parent, callback);	166 UnlockSlotsIfNecessary(modules, reason, host, parent, callback);

167 }	167 }

168	168

169 } // namespace chrome	169 } // namespace chrome

OLD	NEW