summaryrefslogtreecommitdiffstats
path: root/content/browser/loader/resource_loader.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-28 01:33:10 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-28 01:33:10 +0000
commit6952f00643ee2d1a58177dd90f35e3542690cc87 (patch)
treee7fd1854ca634fbcce3198ee499688f545c6bbc0 /content/browser/loader/resource_loader.cc
parent5dcaf8ec918ad9caa97218b7921eb7946911248e (diff)
downloadchromium_src-6952f00643ee2d1a58177dd90f35e3542690cc87.zip
chromium_src-6952f00643ee2d1a58177dd90f35e3542690cc87.tar.gz
chromium_src-6952f00643ee2d1a58177dd90f35e3542690cc87.tar.bz2
Replace the GetAssociatedRenderView call with GetAssociatedRenderFrame in ResourceLoader and SSLClientAuthHandler.
BUG=304341 R=nasko@chromium.org Review URL: https://codereview.chromium.org/120413003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/loader/resource_loader.cc')
-rw-r--r--content/browser/loader/resource_loader.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index 886dba4..00760d0 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -279,8 +279,8 @@ void ResourceLoader::OnSSLCertificateError(net::URLRequest* request,
ResourceRequestInfoImpl* info = GetRequestInfo();
int render_process_id;
- int render_view_id;
- if (!info->GetAssociatedRenderView(&render_process_id, &render_view_id))
+ int render_frame_id;
+ if (!info->GetAssociatedRenderFrame(&render_process_id, &render_frame_id))
NOTREACHED();
SSLManager::OnSSLCertificateError(
@@ -289,7 +289,7 @@ void ResourceLoader::OnSSLCertificateError(net::URLRequest* request,
info->GetResourceType(),
request_->url(),
render_process_id,
- render_view_id,
+ render_frame_id,
ssl_info,
fatal);
}