diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 21:24:18 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 21:24:18 +0000 |
| commit | 60cf2db2288f8808e7afdc4a19164df35db7e455 (patch) | |
| tree | bd24d6ef8e4ad485bb6a10b5d14fd643d375d185 /content/browser/ssl/ssl_error_handler.cc | |
| parent | a4d16a729a56cb09a6f0d4fcdeee5d910734375d (diff) | |
| download | chromium_src-60cf2db2288f8808e7afdc4a19164df35db7e455.zip chromium_src-60cf2db2288f8808e7afdc4a19164df35db7e455.tar.gz chromium_src-60cf2db2288f8808e7afdc4a19164df35db7e455.tar.bz2 | |
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
Diffstat (limited to 'content/browser/ssl/ssl_error_handler.cc')
| -rw-r--r-- | content/browser/ssl/ssl_error_handler.cc | 13 |
1 files changed, 6 insertions, 7 deletions
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 |