Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Unified Diff: chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp

Issue 661241: Linux: implement Client SSL Certificate selection UI (Closed)
Patch Set: fix views and chromeos builds hopefully Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp
diff --git a/chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp b/chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp
index 9d1abe85fd5ee10496cc0eeee5ac3e0031c70b26..74624ab7cabb772171d1c98b00046ba913b2df9e 100644
--- a/chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp
+++ b/chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp
@@ -40,6 +40,11 @@
#include "chrome/third_party/mozilla_security_manager/nsNSSCertificate.h"
+#include <pk11func.h>
+
+#include "app/l10n_util.h"
+#include "grit/generated_resources.h"
+
namespace mozilla_security_manager {
std::string GetCertTitle(CERTCertificate* cert) {
@@ -62,4 +67,12 @@ std::string GetCertTitle(CERTCertificate* cert) {
return rv;
}
+std::string GetCertTokenName(CERTCertificate* cert) {
+ std::string token;
+ if (cert->slot) {
+ token = PK11_GetTokenName(cert->slot);
+ }
+ return token;
+}
+
} // namespace mozilla_security_manager

Powered by Google App Engine
This is Rietveld 408576698