NSS: PKCS 11 password prompt.

chrome/browser/certificate_manager_model.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/certificate_manager_model.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/net/x509_certificate_model.h"
@@ skipping 58 matching lines @@
         rv = WideToUTF16Hack(
             base::TimeFormatShortDateNumeric(cert.valid_expiry()));
       }
       break;
     default:
       NOTREACHED();
   }
   return rv;
 }
 
-int CertificateManagerModel::ImportFromPKCS12(const std::string& data,
+int CertificateManagerModel::ImportFromPKCS12(net::PK11Slot* slot,
+                                              const std::string& data,
                                               const string16& password) {
-  int result = cert_db_.ImportFromPKCS12(data, password);
+  int result = cert_db_.ImportFromPKCS12(slot, data, password);
   if (result == net::OK)
     Refresh();
   return result;
 }
 
 bool CertificateManagerModel::ImportCACerts(
     const net::CertificateList& certificates,
     unsigned int trust_bits,
     net::CertDatabase::ImportCertFailureList* not_imported) {
   bool result = cert_db_.ImportCACerts(certificates, trust_bits, not_imported);
@@ skipping 16 matching lines @@
                                            unsigned int trust_bits) {
   return cert_db_.SetCertTrust(cert, type, trust_bits);
 }
 
 bool CertificateManagerModel::Delete(net::X509Certificate* cert) {
   bool result = cert_db_.DeleteCertAndKey(cert);
   if (result)
     Refresh();
   return result;
 }