| Index: chrome/browser/certificate_manager_model.cc
|
| diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
|
| index 1c7cd4e6b962ddd30f129f10c8e21eeeb7d9f2e0..b6b9bdfadd296e85caf9d74281964185730f2e05 100644
|
| --- a/chrome/browser/certificate_manager_model.cc
|
| +++ b/chrome/browser/certificate_manager_model.cc
|
| @@ -76,9 +76,10 @@ string16 CertificateManagerModel::GetColumnText(
|
| 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;
|
|
|