diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-02 00:29:42 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-02 00:29:42 +0000 |
| commit | 31d555a0ef21f57942e49cf10a362c0a8785340b (patch) | |
| tree | 774fcaa73c7d07cc2e6d1664a3532962ac4d7cc9 /net/cert | |
| parent | c161efa6fb7f0220363eaacdc029571e449dde8a (diff) | |
| download | chromium_src-31d555a0ef21f57942e49cf10a362c0a8785340b.zip chromium_src-31d555a0ef21f57942e49cf10a362c0a8785340b.tar.gz chromium_src-31d555a0ef21f57942e49cf10a362c0a8785340b.tar.bz2 | |
Fixing a problem introduced when "Unknown" certs were renamed
to "Other" certs.
The rename was apparently not quite finished, so some strings
were not found at runtime anymore. This fixes that by finishing
the rename of associated strings.
(TBR'ing trivial rename of enum)
TBR=sky@chromium.org
BUG=243471
TEST=Ran on device and verified that dialog now asks the intended question.
Review URL: https://chromiumcodereview.appspot.com/23567010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/cert')
| -rw-r--r-- | net/cert/cert_type.h | 2 | ||||
| -rw-r--r-- | net/cert/x509_certificate_nss.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/cert/cert_type.h b/net/cert/cert_type.h index cb21227..84fc44a 100644 --- a/net/cert/cert_type.h +++ b/net/cert/cert_type.h @@ -16,7 +16,7 @@ namespace net { // UNKNOWN_CERT. If that cert is then trusted with SetCertTrust(cert, // SERVER_CERT, TRUSTED_SSL), it would become a SERVER_CERT. enum CertType { - UNKNOWN_CERT, + OTHER_CERT, CA_CERT, USER_CERT, SERVER_CERT, diff --git a/net/cert/x509_certificate_nss.cc b/net/cert/x509_certificate_nss.cc index ca25650..9e95413 100644 --- a/net/cert/x509_certificate_nss.cc +++ b/net/cert/x509_certificate_nss.cc @@ -106,7 +106,7 @@ std::string X509Certificate::GetDefaultNickname(CertType type) const { case SERVER_CERT: result = subject_.GetDisplayName(); break; - case UNKNOWN_CERT: + case OTHER_CERT: default: break; } |