bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-04-17 12:17:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix translator error with X509CertificateList (issue #1824)

Browse Source
This commit is contained in:
Marshall Greenblatt 2016-10-27 15:44:31 -04:00
parent 17c2ecd79d
commit ffab334e94
8 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/cef_render_handler.h
View File

@ -38,10 +38,11 @@
#define CEF_INCLUDE_CEF_RENDER_HANDLER_H_ #define CEF_INCLUDE_CEF_RENDER_HANDLER_H_
#pragma once #pragma once
#include <vector>
#include "include/cef_base.h" #include "include/cef_base.h"
#include "include/cef_browser.h" #include "include/cef_browser.h"
#include "include/cef_drag_data.h" #include "include/cef_drag_data.h"
#include <vector>
/// ///
// Implement this interface to handle events when window rendering is disabled. // Implement this interface to handle events when window rendering is disabled.

5
include/cef_request_handler.h
View File

@ -38,6 +38,8 @@
#define CEF_INCLUDE_CEF_REQUEST_HANDLER_H_ #define CEF_INCLUDE_CEF_REQUEST_HANDLER_H_
#pragma once #pragma once
#include <vector>
#include "include/cef_auth_callback.h" #include "include/cef_auth_callback.h"
#include "include/cef_base.h" #include "include/cef_base.h"
#include "include/cef_browser.h" #include "include/cef_browser.h"
@ -96,6 +98,7 @@ class CefRequestHandler : public virtual CefBase {
typedef cef_termination_status_t TerminationStatus; typedef cef_termination_status_t TerminationStatus;
typedef cef_urlrequest_status_t URLRequestStatus; typedef cef_urlrequest_status_t URLRequestStatus;
typedef cef_window_open_disposition_t WindowOpenDisposition; typedef cef_window_open_disposition_t WindowOpenDisposition;
typedef std::vector<CefRefPtr<CefX509Certificate> > X509CertificateList;
/// ///
// Called on the UI thread before browser navigation. Return true to cancel // Called on the UI thread before browser navigation. Return true to cancel
@ -315,7 +318,7 @@ class CefRequestHandler : public virtual CefBase {
bool isProxy, bool isProxy,
const CefString& host, const CefString& host,
int port, int port,
const CefX509CertificateList& certificates, const X509CertificateList& certificates,
CefRefPtr<CefSelectClientCertificateCallback> callback) { CefRefPtr<CefSelectClientCertificateCallback> callback) {
return false; return false;
} }

2
include/cef_x509_certificate.h
View File

@ -185,6 +185,4 @@ class CefX509Certificate : public virtual CefBase {
virtual void GetPEMEncodedIssuerChain(IssuerChainBinaryList& chain) =0; virtual void GetPEMEncodedIssuerChain(IssuerChainBinaryList& chain) =0;
}; };
typedef std::vector<CefRefPtr<CefX509Certificate> > CefX509CertificateList;
#endif // CEF_INCLUDE_CEF_X509_CERTIFICATE_H_ #endif // CEF_INCLUDE_CEF_X509_CERTIFICATE_H_

2
libcef/browser/content_browser_client.cc
View File

@ -780,7 +780,7 @@ void CefContentBrowserClient::SelectClientCertificate(
return; return;
} }
CefX509CertificateList certs; CefRequestHandler::X509CertificateList certs;
for (std::vector<scoped_refptr<net::X509Certificate> >::iterator iter = for (std::vector<scoped_refptr<net::X509Certificate> >::iterator iter =
cert_request_info->client_certs.begin(); cert_request_info->client_certs.begin();
iter != cert_request_info->client_certs.end(); iter++) { iter != cert_request_info->client_certs.end(); iter++) {

2
libcef_dll/ctocpp/request_handler_ctocpp.cc
View File

@ -455,7 +455,7 @@ bool CefRequestHandlerCToCpp::OnCertificateError(CefRefPtr<CefBrowser> browser,
bool CefRequestHandlerCToCpp::OnSelectClientCertificate( bool CefRequestHandlerCToCpp::OnSelectClientCertificate(
CefRefPtr<CefBrowser> browser, bool isProxy, const CefString& host, CefRefPtr<CefBrowser> browser, bool isProxy, const CefString& host,
int port, const CefX509CertificateList& certificates, int port, const X509CertificateList& certificates,
CefRefPtr<CefSelectClientCertificateCallback> callback) { CefRefPtr<CefSelectClientCertificateCallback> callback) {
cef_request_handler_t* _struct = GetStruct(); cef_request_handler_t* _struct = GetStruct();
if (CEF_MEMBER_MISSING(_struct, on_select_client_certificate)) if (CEF_MEMBER_MISSING(_struct, on_select_client_certificate))

3
libcef_dll/ctocpp/request_handler_ctocpp.h
View File

@ -70,8 +70,7 @@ class CefRequestHandlerCToCpp
CefRefPtr<CefSSLInfo> ssl_info, CefRefPtr<CefSSLInfo> ssl_info,
CefRefPtr<CefRequestCallback> callback) override; CefRefPtr<CefRequestCallback> callback) override;
bool OnSelectClientCertificate(CefRefPtr<CefBrowser> browser, bool isProxy, bool OnSelectClientCertificate(CefRefPtr<CefBrowser> browser, bool isProxy,
const CefString& host, int port, const CefString& host, int port, const X509CertificateList& certificates,
const CefX509CertificateList& certificates,
CefRefPtr<CefSelectClientCertificateCallback> callback) override; CefRefPtr<CefSelectClientCertificateCallback> callback) override;
void OnPluginCrashed(CefRefPtr<CefBrowser> browser, void OnPluginCrashed(CefRefPtr<CefBrowser> browser,
const CefString& plugin_path) override; const CefString& plugin_path) override;

2
tests/cefclient/browser/client_handler.cc
View File

@ -705,7 +705,7 @@ bool ClientHandler::OnSelectClientCertificate(
bool isProxy, bool isProxy,
const CefString& host, const CefString& host,
int port, int port,
const CefX509CertificateList& certificates, const X509CertificateList& certificates,
CefRefPtr<CefSelectClientCertificateCallback> callback) { CefRefPtr<CefSelectClientCertificateCallback> callback) {
CEF_REQUIRE_UI_THREAD(); CEF_REQUIRE_UI_THREAD();

2
tests/cefclient/browser/client_handler.h
View File

@ -257,7 +257,7 @@ class ClientHandler : public CefClient,
bool isProxy, bool isProxy,
const CefString& host, const CefString& host,
int port, int port,
const CefX509CertificateList& certificates, const X509CertificateList& certificates,
CefRefPtr<CefSelectClientCertificateCallback> callback) OVERRIDE; CefRefPtr<CefSelectClientCertificateCallback> callback) OVERRIDE;
void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser, void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser,
TerminationStatus status) OVERRIDE; TerminationStatus status) OVERRIDE;