Index: chrome/browser/certificate_manager_model.cc |
diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc |
index be4a21f34759e82e8d97b36547b38a0802b99827..48aafd52695db058b06c7ae0abc21560ac8ee817 100644 |
--- a/chrome/browser/certificate_manager_model.cc |
+++ b/chrome/browser/certificate_manager_model.cc |
@@ -14,6 +14,14 @@ |
#include "net/base/net_errors.h" |
#include "net/base/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) |
: observer_(observer) { |
} |
@@ -70,6 +78,18 @@ string16 CertificateManagerModel::GetColumnText( |
case COL_SUBJECT_NAME: |
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 (crypto::IsTPMTokenReady() && |
+ cert.os_cert_handle()->slot == |
+ cert_db().GetPrivateModule()->os_module_handle()) { |
+ rv = l10n_util::GetStringFUTF16( |
+ IDS_CERT_MANAGER_HARDWARE_BACKED_KEY_FORMAT, |
+ rv, |
+ l10n_util::GetStringUTF16(IDS_CERT_MANAGER_HARDWARE_BACKED)); |
+ } |
+#endif |
break; |
case COL_CERTIFICATE_STORE: |
rv = UTF8ToUTF16( |