From dceb7fcaa3393e54327f77a77e35f6cf81c52521 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 12 May 2014 15:57:40 +0000 Subject: [PATCH] Use correct id type in CefContentBrowserClient::AllowCertificateError (issue #1282). git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1916@1706 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef/browser/content_browser_client.cc | 6 +++--- libcef/browser/content_browser_client.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libcef/browser/content_browser_client.cc b/libcef/browser/content_browser_client.cc index 83e915e03..af09b87cb 100644 --- a/libcef/browser/content_browser_client.cc +++ b/libcef/browser/content_browser_client.cc @@ -691,7 +691,7 @@ content::SpeechRecognitionManagerDelegate* void CefContentBrowserClient::AllowCertificateError( int render_process_id, - int render_view_id, + int render_frame_id, int cert_error, const net::SSLInfo& ssl_info, const GURL& request_url, @@ -711,8 +711,8 @@ void CefContentBrowserClient::AllowCertificateError( } CefRefPtr browser = - CefBrowserHostImpl::GetBrowserForView(render_process_id, - render_view_id); + CefBrowserHostImpl::GetBrowserForFrame(render_process_id, + render_frame_id); if (!browser.get()) return; CefRefPtr client = browser->GetClient(); diff --git a/libcef/browser/content_browser_client.h b/libcef/browser/content_browser_client.h index 0d7901b59..06d2a688e 100644 --- a/libcef/browser/content_browser_client.h +++ b/libcef/browser/content_browser_client.h @@ -106,7 +106,7 @@ class CefContentBrowserClient : public content::ContentBrowserClient { GetSpeechRecognitionManagerDelegate() OVERRIDE; virtual void AllowCertificateError( int render_process_id, - int render_view_id, + int render_frame_id, int cert_error, const net::SSLInfo& ssl_info, const GURL& request_url,