diff options
Diffstat (limited to 'content/browser/renderer_host/cross_site_resource_handler.cc')
| -rw-r--r-- | content/browser/renderer_host/cross_site_resource_handler.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/content/browser/renderer_host/cross_site_resource_handler.cc b/content/browser/renderer_host/cross_site_resource_handler.cc index 1394253..72740fc 100644 --- a/content/browser/renderer_host/cross_site_resource_handler.cc +++ b/content/browser/renderer_host/cross_site_resource_handler.cc @@ -13,7 +13,7 @@ #include "content/browser/renderer_host/render_view_host_notification_task.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" -#include "content/common/resource_response.h" +#include "content/public/common/resource_response.h" #include "net/base/io_buffer.h" #include "net/http/http_response_headers.h" @@ -39,18 +39,20 @@ bool CrossSiteResourceHandler::OnUploadProgress(int request_id, return next_handler_->OnUploadProgress(request_id, position, size); } -bool CrossSiteResourceHandler::OnRequestRedirected(int request_id, - const GURL& new_url, - ResourceResponse* response, - bool* defer) { +bool CrossSiteResourceHandler::OnRequestRedirected( + int request_id, + const GURL& new_url, + content::ResourceResponse* response, + bool* defer) { // We should not have started the transition before being redirected. DCHECK(!in_cross_site_transition_); return next_handler_->OnRequestRedirected( request_id, new_url, response, defer); } -bool CrossSiteResourceHandler::OnResponseStarted(int request_id, - ResourceResponse* response) { +bool CrossSiteResourceHandler::OnResponseStarted( + int request_id, + content::ResourceResponse* response) { // At this point, we know that the response is safe to send back to the // renderer: it is not a download, and it has passed the SSL and safe // browsing checks. @@ -80,8 +82,7 @@ bool CrossSiteResourceHandler::OnResponseStarted(int request_id, // cross-site navigation, since we are unable to tell when to destroy it. // See RenderViewHostManager::RendererAbortedProvisionalLoad. if (info->is_download() || - (response->response_head.headers && - response->response_head.headers->response_code() == 204)) { + (response->headers && response->headers->response_code() == 204)) { return next_handler_->OnResponseStarted(request_id, response); } @@ -190,7 +191,7 @@ CrossSiteResourceHandler::~CrossSiteResourceHandler() {} // telling the old RenderViewHost to run its onunload handler. void CrossSiteResourceHandler::StartCrossSiteTransition( int request_id, - ResourceResponse* response, + content::ResourceResponse* response, const GlobalRequestID& global_id) { in_cross_site_transition_ = true; request_id_ = request_id; |
