diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 05:07:01 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 05:07:01 +0000 |
| commit | e764beaa41529254bf7b9bf481117a4460f9bb22 (patch) | |
| tree | 09817c8c2bddca8d1e0238b16886f21747b21ab0 /chrome/browser/certificate_manager_model.cc | |
| parent | ab544f1c6cd04d2791126ec8f912a08a2a2b9732 (diff) | |
| download | chromium_src-e764beaa41529254bf7b9bf481117a4460f9bb22.zip chromium_src-e764beaa41529254bf7b9bf481117a4460f9bb22.tar.gz chromium_src-e764beaa41529254bf7b9bf481117a4460f9bb22.tar.bz2 | |
Don't use nss_util in CertificateManagerModel::IsHardwareBacked.
Avoids threading issues.
IsHardwareBacked works on non-ChromeOS platforms now too.
BUG=125848
Review URL: https://codereview.chromium.org/76653003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236160 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/certificate_manager_model.cc')
| -rw-r--r-- | chrome/browser/certificate_manager_model.cc | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc index 57f0b19..1b66dee 100644 --- a/chrome/browser/certificate_manager_model.cc +++ b/chrome/browser/certificate_manager_model.cc @@ -10,17 +10,11 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/crypto_module_password_dialog.h" #include "chrome/common/net/x509_certificate_model.h" +#include "grit/generated_resources.h" #include "net/base/crypto_module.h" #include "net/base/net_errors.h" #include "net/cert/x509_certificate.h" - -#if defined(OS_CHROMEOS) -#include <cert.h> - -#include "crypto/nss_util.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#endif CertificateManagerModel::CertificateManagerModel(Observer* observer) : cert_db_(net::NSSCertDatabase::GetInstance()), @@ -81,7 +75,6 @@ string16 CertificateManagerModel::GetColumnText( rv = UTF8ToUTF16( x509_certificate_model::GetCertNameOrNickname(cert.os_cert_handle())); -#if defined(OS_CHROMEOS) // TODO(xiyuan): Put this into a column when we have js tree-table. if (IsHardwareBacked(&cert)) { rv = l10n_util::GetStringFUTF16( @@ -89,7 +82,6 @@ string16 CertificateManagerModel::GetColumnText( rv, l10n_util::GetStringUTF16(IDS_CERT_MANAGER_HARDWARE_BACKED)); } -#endif break; case COL_CERTIFICATE_STORE: rv = UTF8ToUTF16( @@ -157,11 +149,5 @@ bool CertificateManagerModel::Delete(net::X509Certificate* cert) { bool CertificateManagerModel::IsHardwareBacked( const net::X509Certificate* cert) const { -#if defined(OS_CHROMEOS) - return crypto::IsTPMTokenReady() && - cert->os_cert_handle()->slot == - cert_db_->GetPrivateModule()->os_module_handle(); -#else - return false; -#endif + return cert_db_->IsHardwareBacked(cert); } |