From 60cf2db2288f8808e7afdc4a19164df35db7e455 Mon Sep 17 00:00:00 2001 From: "darin@chromium.org" Date: Wed, 7 Mar 2012 21:24:18 +0000 Subject: Add ResourceRequestInfo. ResourceRequestInfo exposes the members of ResourceDispatcherHostRequestInfo required by src/chrome. ResourceDispatcherHostRequestInfo remains for use by src/content (maybe it should have a different name), and ResourceDispatcherHostRequestInfo subclasses ResourceRequestInfo. ResourceDispatcherHost::RenderViewForRequest is removed in favor of ResourceRequestInfo::GetAssociatedRenderView(). src/chrome uses ResourceRequestInfo::ForRequest(URLRequest*) instead of ResourceDispatcherHost::InfoForRequest. Deletes DummyResourceHandler in favor of just having ~ResourceDispatcherHostRequestInfo null-test its ResourceHandler. R=jam@chromium.org TBR=mirandac@chromium.org,ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9580002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125457 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/ssl/ssl_error_handler.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'content/browser/ssl/ssl_error_handler.cc') diff --git a/content/browser/ssl/ssl_error_handler.cc b/content/browser/ssl/ssl_error_handler.cc index ee06a32..0632193 100644 --- a/content/browser/ssl/ssl_error_handler.cc +++ b/content/browser/ssl/ssl_error_handler.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" -#include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" +#include "content/browser/renderer_host/resource_request_info_impl.h" #include "content/browser/ssl/ssl_cert_error_handler.h" #include "content/browser/tab_contents/navigation_controller_impl.h" #include "content/browser/tab_contents/tab_contents.h" @@ -17,6 +17,7 @@ using content::BrowserThread; using content::RenderViewHostImpl; +using content::ResourceRequestInfoImpl; using content::WebContents; SSLErrorHandler::SSLErrorHandler(ResourceDispatcherHost* rdh, @@ -30,14 +31,12 @@ SSLErrorHandler::SSLErrorHandler(ResourceDispatcherHost* rdh, request_has_been_notified_(false) { DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI)); - ResourceDispatcherHostRequestInfo* info = + ResourceRequestInfoImpl* info = ResourceDispatcherHost::InfoForRequest(request); - request_id_.child_id = info->child_id(); - request_id_.request_id = info->request_id(); + request_id_.child_id = info->GetChildID(); + request_id_.request_id = info->GetRequestID(); - if (!ResourceDispatcherHost::RenderViewForRequest(request, - &render_process_id_, - &render_view_id_)) + if (!info->GetAssociatedRenderView(&render_process_id_, &render_view_id_)) NOTREACHED(); // This makes sure we don't disappear on the IO thread until we've given an -- cgit v1.1