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 /content | |
| 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 'content')
| -rw-r--r-- | content/browser/ssl/ssl_client_auth_handler.cc | 12 | ||||
| -rw-r--r-- | content/browser/ssl/ssl_client_auth_handler.h | 2 | ||||
| -rw-r--r-- | content/public/browser/content_browser_client.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc index 60d57d4..b7fe9f0 100644 --- a/content/browser/ssl/ssl_client_auth_handler.cc +++ b/content/browser/ssl/ssl_client_auth_handler.cc @@ -80,10 +80,10 @@ void SSLClientAuthHandler::DidGetClientCerts() { } int render_process_host_id; - int render_view_host_id; - if (!ResourceRequestInfo::ForRequest(request_)->GetAssociatedRenderView( + int render_frame_host_id; + if (!ResourceRequestInfo::ForRequest(request_)->GetAssociatedRenderFrame( &render_process_host_id, - &render_view_host_id)) + &render_frame_host_id)) NOTREACHED(); // If the RVH does not exist by the time this task gets run, then the task @@ -94,7 +94,7 @@ void SSLClientAuthHandler::DidGetClientCerts() { BrowserThread::UI, FROM_HERE, base::Bind( &SSLClientAuthHandler::DoSelectCertificate, this, - render_process_host_id, render_view_host_id)); + render_process_host_id, render_frame_host_id)); } void SSLClientAuthHandler::DoCertificateSelected(net::X509Certificate* cert) { @@ -113,10 +113,10 @@ void SSLClientAuthHandler::DoCertificateSelected(net::X509Certificate* cert) { } void SSLClientAuthHandler::DoSelectCertificate( - int render_process_host_id, int render_view_host_id) { + int render_process_host_id, int render_frame_host_id) { GetContentClient()->browser()->SelectClientCertificate( render_process_host_id, - render_view_host_id, + render_frame_host_id, http_network_session_, cert_request_info_.get(), base::Bind(&SSLClientAuthHandler::CertificateSelected, this)); diff --git a/content/browser/ssl/ssl_client_auth_handler.h b/content/browser/ssl/ssl_client_auth_handler.h index bbc7747..b848d54 100644 --- a/content/browser/ssl/ssl_client_auth_handler.h +++ b/content/browser/ssl/ssl_client_auth_handler.h @@ -66,7 +66,7 @@ class CONTENT_EXPORT SSLClientAuthHandler // Selects a client certificate on the UI thread. void DoSelectCertificate(int render_process_host_id, - int render_view_host_id); + int render_frame_host_id); // The net::URLRequest that triggered this client auth. net::URLRequest* request_; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index c87f31c2..8878a9a 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -401,7 +401,7 @@ class CONTENT_EXPORT ContentBrowserClient { // certificate was selected NULL is returned to the |callback|. 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) {} |