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

Side by Side Diff: net/base/keygen_handler.cc

Issue 6303004: Cleanup: replace usage of "pk11" with "pkcs11" or "crypto module", as appropriate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sorting fix again Created 9 years, 11 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
« no previous file with comments | « net/base/keygen_handler.h ('k') | net/base/keygen_handler_nss.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "net/base/keygen_handler.h" 5 #include "net/base/keygen_handler.h"
6 6
7 #if defined(USE_NSS) 7 #if defined(USE_NSS)
8 #include "base/crypto/pk11_blocking_password_delegate.h" 8 #include "base/crypto/crypto_module_blocking_password_delegate.h"
9 #endif 9 #endif
10 10
11 namespace net { 11 namespace net {
12 12
13 // The constructor and destructor must be defined in a .cc file so that 13 // The constructor and destructor must be defined in a .cc file so that
14 // PK11BlockingPasswordDelegate can be forward-declared on platforms which use 14 // CryptoModuleBlockingPasswordDelegate can be forward-declared on platforms
15 // NSS. 15 // which use NSS.
16 16
17 KeygenHandler::KeygenHandler(int key_size_in_bits, 17 KeygenHandler::KeygenHandler(int key_size_in_bits,
18 const std::string& challenge, 18 const std::string& challenge,
19 const GURL& url) 19 const GURL& url)
20 : key_size_in_bits_(key_size_in_bits), 20 : key_size_in_bits_(key_size_in_bits),
21 challenge_(challenge), 21 challenge_(challenge),
22 url_(url), 22 url_(url),
23 stores_key_(true) { 23 stores_key_(true) {
24 } 24 }
25 25
26 KeygenHandler::~KeygenHandler() { 26 KeygenHandler::~KeygenHandler() {
27 } 27 }
28 28
29 } // namespace net 29 } // namespace net
OLDNEW
« no previous file with comments | « net/base/keygen_handler.h ('k') | net/base/keygen_handler_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698