mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 9cedf753 (#418732)
- Simplify usage of OnBeforePluginLoad (issue #2015) - Switch crash reporting from crashpad to breakpad on Windows and OS X. Adds a new chrome_elf.dll dependency on Windows (issue #1995) - Remove CefTextfield::GetPlaceholderTextColor() method which is no longer supported by Chromium.
This commit is contained in:
@ -6,7 +6,6 @@
|
||||
|
||||
#include "libcef/browser/x509_certificate_impl.h"
|
||||
|
||||
#include "content/public/browser/cert_store.h"
|
||||
#include "net/ssl/ssl_connection_status_flags.h"
|
||||
|
||||
CefSSLStatusImpl::CefSSLStatusImpl(const content::SSLStatus& value) {
|
||||
@ -14,12 +13,11 @@ CefSSLStatusImpl::CefSSLStatusImpl(const content::SSLStatus& value) {
|
||||
content_status_ = static_cast<cef_ssl_content_status_t>(value.content_status);
|
||||
ssl_version_ = static_cast<cef_ssl_version_t>(
|
||||
net::SSLConnectionStatusToVersion(value.connection_status));
|
||||
cert_id_ = value.cert_id;
|
||||
certificate_ = value.certificate;
|
||||
}
|
||||
|
||||
bool CefSSLStatusImpl::IsSecureConnection() {
|
||||
// Secure connection if there was a certificate ID in SSLStatus.
|
||||
return (cert_id_ != 0);
|
||||
return !!certificate_.get();
|
||||
}
|
||||
|
||||
cef_cert_status_t CefSSLStatusImpl::GetCertStatus() {
|
||||
@ -35,11 +33,7 @@ cef_ssl_content_status_t CefSSLStatusImpl::GetContentStatus() {
|
||||
}
|
||||
|
||||
CefRefPtr<CefX509Certificate> CefSSLStatusImpl::GetX509Certificate() {
|
||||
if (cert_id_) {
|
||||
scoped_refptr<net::X509Certificate> cert;
|
||||
content::CertStore::GetInstance()->RetrieveCert(cert_id_, &cert);
|
||||
if (cert.get())
|
||||
return new CefX509CertificateImpl(*cert);
|
||||
}
|
||||
return nullptr;
|
||||
if (certificate_ && !cef_certificate_)
|
||||
cef_certificate_ = new CefX509CertificateImpl(*certificate_);
|
||||
return cef_certificate_;
|
||||
}
|
||||
|
Reference in New Issue
Block a user