diff options
Diffstat (limited to 'chrome/browser/renderer_host')
6 files changed, 21 insertions, 19 deletions
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc index 0f3a7a8..2ad3a5d 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc @@ -306,7 +306,7 @@ bool ChromeResourceDispatcherHostDelegate::ShouldForceDownloadResource( void ChromeResourceDispatcherHostDelegate::OnResponseStarted( net::URLRequest* request, - ResourceResponse* response, + content::ResourceResponse* response, ResourceMessageFilter* filter) { LoadTimingObserver::PopulateTimingInfo(request, response); @@ -339,7 +339,7 @@ void ChromeResourceDispatcherHostDelegate::OnResponseStarted( void ChromeResourceDispatcherHostDelegate::OnRequestRedirected( net::URLRequest* request, - ResourceResponse* response, + content::ResourceResponse* response, ResourceMessageFilter* filter) { LoadTimingObserver::PopulateTimingInfo(request, response); } diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h index 6aab52d..0fc5cb6 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h @@ -74,11 +74,11 @@ class ChromeResourceDispatcherHostDelegate const GURL& url, const std::string& mime_type) OVERRIDE; virtual void OnResponseStarted( net::URLRequest* request, - ResourceResponse* response, + content::ResourceResponse* response, ResourceMessageFilter* filter) OVERRIDE; virtual void OnRequestRedirected( net::URLRequest* request, - ResourceResponse* response, + content::ResourceResponse* response, ResourceMessageFilter* filter) OVERRIDE; private: diff --git a/chrome/browser/renderer_host/offline_resource_handler.cc b/chrome/browser/renderer_host/offline_resource_handler.cc index 66e4cee..536e27cc 100644 --- a/chrome/browser/renderer_host/offline_resource_handler.cc +++ b/chrome/browser/renderer_host/offline_resource_handler.cc @@ -54,16 +54,18 @@ bool OfflineResourceHandler::OnUploadProgress(int request_id, return next_handler_->OnUploadProgress(request_id, position, size); } -bool OfflineResourceHandler::OnRequestRedirected(int request_id, - const GURL& new_url, - ResourceResponse* response, - bool* defer) { +bool OfflineResourceHandler::OnRequestRedirected( + int request_id, + const GURL& new_url, + content::ResourceResponse* response, + bool* defer) { return next_handler_->OnRequestRedirected( request_id, new_url, response, defer); } -bool OfflineResourceHandler::OnResponseStarted(int request_id, - ResourceResponse* response) { +bool OfflineResourceHandler::OnResponseStarted( + int request_id, + content::ResourceResponse* response) { return next_handler_->OnResponseStarted(request_id, response); } diff --git a/chrome/browser/renderer_host/offline_resource_handler.h b/chrome/browser/renderer_host/offline_resource_handler.h index 2966c0d..b28d5f7 100644 --- a/chrome/browser/renderer_host/offline_resource_handler.h +++ b/chrome/browser/renderer_host/offline_resource_handler.h @@ -35,9 +35,9 @@ class OfflineResourceHandler : public ResourceHandler { virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size) OVERRIDE; virtual bool OnRequestRedirected(int request_id, const GURL& new_url, - ResourceResponse* response, bool* defer) OVERRIDE; + content::ResourceResponse* response, bool* defer) OVERRIDE; virtual bool OnResponseStarted(int request_id, - ResourceResponse* response) OVERRIDE; + content::ResourceResponse* response) OVERRIDE; virtual bool OnWillStart(int request_id, const GURL& url, bool* defer) OVERRIDE; virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size, diff --git a/chrome/browser/renderer_host/safe_browsing_resource_handler.cc b/chrome/browser/renderer_host/safe_browsing_resource_handler.cc index 97a2bb9..2d97154 100644 --- a/chrome/browser/renderer_host/safe_browsing_resource_handler.cc +++ b/chrome/browser/renderer_host/safe_browsing_resource_handler.cc @@ -12,7 +12,7 @@ #include "content/browser/renderer_host/global_request_id.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_message_filter.h" -#include "content/common/resource_response.h" +#include "content/public/common/resource_response.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" @@ -70,7 +70,7 @@ bool SafeBrowsingResourceHandler::OnUploadProgress(int request_id, bool SafeBrowsingResourceHandler::OnRequestRedirected( int request_id, const GURL& new_url, - ResourceResponse* response, + content::ResourceResponse* response, bool* defer) { CHECK(state_ == STATE_NONE); CHECK(defer_state_ == DEFERRED_NONE); @@ -98,7 +98,7 @@ bool SafeBrowsingResourceHandler::OnRequestRedirected( } bool SafeBrowsingResourceHandler::OnResponseStarted( - int request_id, ResourceResponse* response) { + int request_id, content::ResourceResponse* response) { CHECK(state_ == STATE_NONE); CHECK(defer_state_ == DEFERRED_NONE); return next_handler_->OnResponseStarted(request_id, response); @@ -334,7 +334,7 @@ void SafeBrowsingResourceHandler::ResumeRedirect() { // Retrieve the details for the paused OnReceivedRedirect(). int request_id = deferred_request_id_; GURL redirect_url = deferred_url_; - scoped_refptr<ResourceResponse> redirect_response = + scoped_refptr<content::ResourceResponse> redirect_response = deferred_redirect_response_; ClearDeferredRequestInfo(); diff --git a/chrome/browser/renderer_host/safe_browsing_resource_handler.h b/chrome/browser/renderer_host/safe_browsing_resource_handler.h index bc5bdf9..a1a8470 100644 --- a/chrome/browser/renderer_host/safe_browsing_resource_handler.h +++ b/chrome/browser/renderer_host/safe_browsing_resource_handler.h @@ -54,10 +54,10 @@ class SafeBrowsingResourceHandler : public ResourceHandler, virtual bool OnUploadProgress( int request_id, uint64 position, uint64 size) OVERRIDE; virtual bool OnRequestRedirected( - int request_id, const GURL& new_url, ResourceResponse* response, + int request_id, const GURL& new_url, content::ResourceResponse* response, bool* defer) OVERRIDE; virtual bool OnResponseStarted( - int request_id, ResourceResponse* response) OVERRIDE; + int request_id, content::ResourceResponse* response) OVERRIDE; virtual bool OnWillStart( int request_id, const GURL& url, bool* defer) OVERRIDE; virtual bool OnWillRead( @@ -152,7 +152,7 @@ class SafeBrowsingResourceHandler : public ResourceHandler, // valid to access these members when defer_state_ != DEFERRED_NONE. GURL deferred_url_; int deferred_request_id_; - scoped_refptr<ResourceResponse> deferred_redirect_response_; + scoped_refptr<content::ResourceResponse> deferred_redirect_response_; scoped_refptr<ResourceHandler> next_handler_; int render_process_host_id_; |