mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
- Pass SSL certificate information to CefRequestHandler::OnCertificateError via a new CefSSLInfo interface (issue #1530).
- cefclient: Improve error message text and use a data: URI instead of LoadString for loading error messages (issue #579). - Add functions in cef_url.h for base64 and URI encoding/decoding (issue #579). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@2028 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -18,6 +18,7 @@
|
||||
#include "libcef_dll/ctocpp/frame_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/quota_callback_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/request_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/sslinfo_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/web_plugin_info_ctocpp.h"
|
||||
|
||||
|
||||
@ -271,18 +272,27 @@ void CEF_CALLBACK request_handler_on_protocol_execution(
|
||||
}
|
||||
|
||||
int CEF_CALLBACK request_handler_on_certificate_error(
|
||||
struct _cef_request_handler_t* self, cef_errorcode_t cert_error,
|
||||
const cef_string_t* request_url,
|
||||
struct _cef_request_handler_t* self, cef_browser_t* browser,
|
||||
cef_errorcode_t cert_error, const cef_string_t* request_url,
|
||||
struct _cef_sslinfo_t* ssl_info,
|
||||
cef_allow_certificate_error_callback_t* callback) {
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
if (!self)
|
||||
return 0;
|
||||
// Verify param: browser; type: refptr_diff
|
||||
DCHECK(browser);
|
||||
if (!browser)
|
||||
return 0;
|
||||
// Verify param: request_url; type: string_byref_const
|
||||
DCHECK(request_url);
|
||||
if (!request_url)
|
||||
return 0;
|
||||
// Verify param: ssl_info; type: refptr_diff
|
||||
DCHECK(ssl_info);
|
||||
if (!ssl_info)
|
||||
return 0;
|
||||
// Verify param: callback; type: refptr_diff
|
||||
DCHECK(callback);
|
||||
if (!callback)
|
||||
@ -290,8 +300,10 @@ int CEF_CALLBACK request_handler_on_certificate_error(
|
||||
|
||||
// Execute
|
||||
bool _retval = CefRequestHandlerCppToC::Get(self)->OnCertificateError(
|
||||
CefBrowserCToCpp::Wrap(browser),
|
||||
cert_error,
|
||||
CefString(request_url),
|
||||
CefSSLInfoCToCpp::Wrap(ssl_info),
|
||||
CefAllowCertificateErrorCallbackCToCpp::Wrap(callback));
|
||||
|
||||
// Return type: bool
|
||||
|
Reference in New Issue
Block a user