summaryrefslogtreecommitdiffstats
path: root/content/browser/ssl
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/ssl')
-rw-r--r--content/browser/ssl/ssl_client_auth_handler.cc12
-rw-r--r--content/browser/ssl/ssl_client_auth_handler.h2
2 files changed, 7 insertions, 7 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_;