diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-21 17:54:50 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-21 17:54:50 +0000 |
| commit | 094c877cb27f036cbd52d49e65c23ab638a2625c (patch) | |
| tree | 443d4fcb47298e861735a3a1fbccdf0e61794829 /chrome/browser | |
| parent | 2491f1422adfe41202cfa49194d7628ec2651a74 (diff) | |
| download | chromium_src-094c877cb27f036cbd52d49e65c23ab638a2625c.zip chromium_src-094c877cb27f036cbd52d49e65c23ab638a2625c.tar.gz chromium_src-094c877cb27f036cbd52d49e65c23ab638a2625c.tar.bz2 | |
Replace the GetAssociatedRenderView call with GetAssociatedRenderFrame in SSLClientAuthHandler.
BUG=304341
R=nasko@chromium.org
Review URL: https://codereview.chromium.org/109653016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 13 | ||||
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.h | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 5d84306..8558948 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -114,6 +114,7 @@ #include "content/public/browser/browser_url_handler.h" #include "content/public/browser/child_process_data.h" #include "content/public/browser/child_process_security_policy.h" +#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/resource_context.h" @@ -1803,12 +1804,18 @@ void ChromeContentBrowserClient::AllowCertificateError( void ChromeContentBrowserClient::SelectClientCertificate( int render_process_id, - int render_view_id, + int render_frame_id, const net::HttpNetworkSession* network_session, net::SSLCertRequestInfo* cert_request_info, const base::Callback<void(net::X509Certificate*)>& callback) { - WebContents* tab = tab_util::GetWebContentsByID( - render_process_id, render_view_id); + content::RenderFrameHost* rfh = content::RenderFrameHost::FromID( + render_process_id, render_frame_id); + if (!rfh) { + NOTREACHED(); + return; + } + + WebContents* tab = WebContents::FromRenderFrameHost(rfh); if (!tab) { NOTREACHED(); return; diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h index 6387bf6..99ccb01 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h @@ -165,7 +165,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { content::CertificateRequestResultType* request) OVERRIDE; virtual void SelectClientCertificate( int render_process_id, - int render_view_id, + int render_frame_id, const net::HttpNetworkSession* network_session, net::SSLCertRequestInfo* cert_request_info, const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; |