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 /chrome/browser/ssl/ssl_add_cert_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 'chrome/browser/ssl/ssl_add_cert_handler.cc')
| -rw-r--r-- | chrome/browser/ssl/ssl_add_cert_handler.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/ssl/ssl_add_cert_handler.cc b/chrome/browser/ssl/ssl_add_cert_handler.cc index 71084ed..740088f 100644 --- a/chrome/browser/ssl/ssl_add_cert_handler.cc +++ b/chrome/browser/ssl/ssl_add_cert_handler.cc @@ -8,9 +8,8 @@ #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/renderer_host/resource_dispatcher_host.h" -#include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/resource_request_info.h" #include "content/public/browser/web_contents.h" #include "net/base/cert_database.h" #include "net/base/net_errors.h" @@ -27,9 +26,8 @@ SSLAddCertHandler::SSLAddCertHandler(net::URLRequest* request, : cert_(cert), render_process_host_id_(render_process_host_id), render_view_id_(render_view_id) { - ResourceDispatcherHostRequestInfo* info = - ResourceDispatcherHost::InfoForRequest(request); - network_request_id_ = info->request_id(); + network_request_id_ + = content::ResourceRequestInfo::ForRequest(request)->GetRequestID(); // Stay alive until the process completes and Finished() is called. AddRef(); // Delay adding the certificate until the next mainloop iteration. |