diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-31 20:10:58 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-31 20:10:58 +0000 |
| commit | 1a4e9752e622e91fab073fa3c9e70dcc5f2a3ac9 (patch) | |
| tree | 2f19e65459454d7b83608294c3eca50d4f386f99 /content/browser/ssl/ssl_error_handler.cc | |
| parent | ec0595a4a9ec0d9c99e77b51b2d2da1b074954a5 (diff) | |
| download | chromium_src-1a4e9752e622e91fab073fa3c9e70dcc5f2a3ac9.zip chromium_src-1a4e9752e622e91fab073fa3c9e70dcc5f2a3ac9.tar.gz chromium_src-1a4e9752e622e91fab073fa3c9e70dcc5f2a3ac9.tar.bz2 | |
Replace the GetAssociatedRenderView call with GetAssociatedRenderFrame in ResourceLoader and SSLClientAuthHandler.
BUG=304341
R=nasko@chromium.org
TBR=mkosiba
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=242656
Review URL: https://codereview.chromium.org/120413003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ssl/ssl_error_handler.cc')
| -rw-r--r-- | content/browser/ssl/ssl_error_handler.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/content/browser/ssl/ssl_error_handler.cc b/content/browser/ssl/ssl_error_handler.cc index 8a322f7..ed4c2ac 100644 --- a/content/browser/ssl/ssl_error_handler.cc +++ b/content/browser/ssl/ssl_error_handler.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "content/browser/frame_host/navigation_controller_impl.h" -#include "content/browser/renderer_host/render_view_host_impl.h" +#include "content/browser/frame_host/render_frame_host_impl.h" #include "content/browser/ssl/ssl_cert_error_handler.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/browser_thread.h" @@ -23,12 +23,12 @@ SSLErrorHandler::SSLErrorHandler(const base::WeakPtr<Delegate>& delegate, ResourceType::Type resource_type, const GURL& url, int render_process_id, - int render_view_id) + int render_frame_id) : manager_(NULL), request_id_(id), delegate_(delegate), render_process_id_(render_process_id), - render_view_id_(render_view_id), + render_frame_id_(render_frame_id), request_url_(url), resource_type_(resource_type), request_has_been_notified_(false) { @@ -61,10 +61,10 @@ void SSLErrorHandler::Dispatch() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); WebContents* web_contents = NULL; - RenderViewHostImpl* render_view_host = - RenderViewHostImpl::FromID(render_process_id_, render_view_id_); - if (render_view_host) - web_contents = render_view_host->GetDelegate()->GetAsWebContents(); + RenderFrameHost* render_frame_host = + RenderFrameHost::FromID(render_process_id_, render_frame_id_); + if (render_frame_host) + web_contents = WebContents::FromRenderFrameHost(render_frame_host); if (!web_contents) { // We arrived on the UI thread, but the tab we're looking for is no longer |