| OLD | NEW |
| 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 "content/browser/certificate_manager_model.h" | 5 #include "content/browser/certificate_manager_model.h" |
| 6 | 6 |
| 7 #include "base/callback_old.h" |
| 7 #include "base/i18n/time_formatting.h" | 8 #include "base/i18n/time_formatting.h" |
| 8 #include "base/logging.h" | 9 #include "base/logging.h" |
| 9 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/ui/crypto_module_password_dialog.h" | 11 #include "chrome/browser/ui/crypto_module_password_dialog.h" |
| 11 #include "chrome/common/net/x509_certificate_model.h" | 12 #include "chrome/common/net/x509_certificate_model.h" |
| 12 #include "net/base/crypto_module.h" | 13 #include "net/base/crypto_module.h" |
| 13 #include "net/base/net_errors.h" | 14 #include "net/base/net_errors.h" |
| 14 #include "net/base/x509_certificate.h" | 15 #include "net/base/x509_certificate.h" |
| 15 | 16 |
| 16 CertificateManagerModel::CertificateManagerModel(Observer* observer) | 17 CertificateManagerModel::CertificateManagerModel(Observer* observer) |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 unsigned int trust_bits) { | 123 unsigned int trust_bits) { |
| 123 return cert_db_.SetCertTrust(cert, type, trust_bits); | 124 return cert_db_.SetCertTrust(cert, type, trust_bits); |
| 124 } | 125 } |
| 125 | 126 |
| 126 bool CertificateManagerModel::Delete(net::X509Certificate* cert) { | 127 bool CertificateManagerModel::Delete(net::X509Certificate* cert) { |
| 127 bool result = cert_db_.DeleteCertAndKey(cert); | 128 bool result = cert_db_.DeleteCertAndKey(cert); |
| 128 if (result) | 129 if (result) |
| 129 Refresh(); | 130 Refresh(); |
| 130 return result; | 131 return result; |
| 131 } | 132 } |
| OLD | NEW |