diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-28 13:11:52 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-28 13:11:52 +0000 |
commit | edfe7faba2f8685eb84b1821ba6fa054297e71fc (patch) | |
tree | b818efe30d5c178c8358cf75baffe371b5374109 /chrome/browser/renderer_host | |
parent | c0528f5013e9039d699dba6682bce248672d3937 (diff) | |
download | chromium_src-edfe7faba2f8685eb84b1821ba6fa054297e71fc.zip chromium_src-edfe7faba2f8685eb84b1821ba6fa054297e71fc.tar.gz chromium_src-edfe7faba2f8685eb84b1821ba6fa054297e71fc.tar.bz2 |
net: Add namespace net to URLRequest and URLRequestJob classes.
BUG=64263
TEST=compiled locally and trybots
Review URL: http://codereview.chromium.org/5298008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
7 files changed, 40 insertions, 20 deletions
diff --git a/chrome/browser/renderer_host/buffered_resource_handler.h b/chrome/browser/renderer_host/buffered_resource_handler.h index 69e64c5..05cbd48 100644 --- a/chrome/browser/renderer_host/buffered_resource_handler.h +++ b/chrome/browser/renderer_host/buffered_resource_handler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,14 +12,17 @@ class MessageLoop; class ResourceDispatcherHost; + +namespace net { class URLRequest; +} // namespace net // Used to buffer a request until enough data has been received. class BufferedResourceHandler : public ResourceHandler { public: BufferedResourceHandler(ResourceHandler* handler, ResourceDispatcherHost* host, - URLRequest* request); + net::URLRequest* request); // ResourceHandler implementation: virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size); @@ -79,7 +82,7 @@ class BufferedResourceHandler : public ResourceHandler { scoped_refptr<ResourceHandler> real_handler_; scoped_refptr<ResourceResponse> response_; ResourceDispatcherHost* host_; - URLRequest* request_; + net::URLRequest* request_; scoped_refptr<net::IOBuffer> read_buffer_; scoped_refptr<net::IOBuffer> my_buffer_; int read_buffer_size_; diff --git a/chrome/browser/renderer_host/download_resource_handler.h b/chrome/browser/renderer_host/download_resource_handler.h index 302a9e0..95c09da2 100644 --- a/chrome/browser/renderer_host/download_resource_handler.h +++ b/chrome/browser/renderer_host/download_resource_handler.h @@ -15,9 +15,12 @@ class DownloadFileManager; class ResourceDispatcherHost; -class URLRequest; struct DownloadBuffer; +namespace net { +class URLRequest; +} // namespace net + // Forwards data to the download thread. class DownloadResourceHandler : public ResourceHandler { public: @@ -27,7 +30,7 @@ class DownloadResourceHandler : public ResourceHandler { int request_id, const GURL& url, DownloadFileManager* download_file_manager, - URLRequest* request, + net::URLRequest* request, bool save_as, const DownloadSaveInfo& save_info); @@ -79,7 +82,7 @@ class DownloadResourceHandler : public ResourceHandler { GURL url_; int64 content_length_; DownloadFileManager* download_file_manager_; - URLRequest* request_; + net::URLRequest* request_; bool save_as_; // Request was initiated via "Save As" by the user. DownloadSaveInfo save_info_; DownloadBuffer* buffer_; diff --git a/chrome/browser/renderer_host/download_throttling_resource_handler.h b/chrome/browser/renderer_host/download_throttling_resource_handler.h index 308792f..22de040 100644 --- a/chrome/browser/renderer_host/download_throttling_resource_handler.h +++ b/chrome/browser/renderer_host/download_throttling_resource_handler.h @@ -14,7 +14,10 @@ class DownloadResourceHandler; class ResourceDispatcherHost; + +namespace net { class URLRequest; +} // namespace net // DownloadThrottlingResourceHandler is used to determine if a download should // be allowed. When a DownloadThrottlingResourceHandler is created it pauses the @@ -29,7 +32,7 @@ class DownloadThrottlingResourceHandler public DownloadRequestLimiter::Callback { public: DownloadThrottlingResourceHandler(ResourceDispatcherHost* host, - URLRequest* request, + net::URLRequest* request, const GURL& url, int render_process_host_id, int render_view_id, @@ -63,7 +66,7 @@ class DownloadThrottlingResourceHandler void CopyTmpBufferToDownloadHandler(); ResourceDispatcherHost* host_; - URLRequest* request_; + net::URLRequest* request_; GURL url_; int render_process_host_id_; int render_view_id_; diff --git a/chrome/browser/renderer_host/offline_resource_handler.h b/chrome/browser/renderer_host/offline_resource_handler.h index 8c72ead..eb19072 100644 --- a/chrome/browser/renderer_host/offline_resource_handler.h +++ b/chrome/browser/renderer_host/offline_resource_handler.h @@ -14,7 +14,10 @@ class MessageLoop; class ResourceDispatcherHost; + +namespace net { class URLRequest; +} // namespace net // Used to show an offline interstitial page when the network is not available. class OfflineResourceHandler : public ResourceHandler, @@ -24,7 +27,7 @@ class OfflineResourceHandler : public ResourceHandler, int host_id, int render_view_id, ResourceDispatcherHost* rdh, - URLRequest* request); + net::URLRequest* request); ~OfflineResourceHandler() {} // ResourceHandler implementation: @@ -63,7 +66,7 @@ class OfflineResourceHandler : public ResourceHandler, int process_host_id_; int render_view_id_; ResourceDispatcherHost* rdh_; - URLRequest* request_; + net::URLRequest* request_; // The state for deferred load quest. int deferred_request_id_; diff --git a/chrome/browser/renderer_host/resource_queue.h b/chrome/browser/renderer_host/resource_queue.h index bd71150..d6ce412 100644 --- a/chrome/browser/renderer_host/resource_queue.h +++ b/chrome/browser/renderer_host/resource_queue.h @@ -11,8 +11,11 @@ #include "base/basictypes.h" -class ResourceDispatcherHostRequestInfo; +namespace net { class URLRequest; +} // namespace net + +class ResourceDispatcherHostRequestInfo; struct GlobalRequestID; // Makes decisions about delaying or not each URLRequest in the queue. @@ -23,7 +26,7 @@ class ResourceQueueDelegate { // point. To start the delayed request, ResourceQueue::StartDelayedRequest // should be used. virtual bool ShouldDelayRequest( - URLRequest* request, + net::URLRequest* request, const ResourceDispatcherHostRequestInfo& request_info, const GlobalRequestID& request_id) = 0; @@ -59,7 +62,7 @@ class ResourceQueue { // Takes care to start the |request| after all delegates allow that. If no // delegate demands delaying the request it will be started immediately. - void AddRequest(URLRequest* request, + void AddRequest(net::URLRequest* request, const ResourceDispatcherHostRequestInfo& request_info); // Tells the queue that the URLRequest object associated with |request_id| @@ -73,7 +76,7 @@ class ResourceQueue { const GlobalRequestID& request_id); private: - typedef std::map<GlobalRequestID, URLRequest*> RequestMap; + typedef std::map<GlobalRequestID, net::URLRequest*> RequestMap; typedef std::map<GlobalRequestID, DelegateSet> InterestedDelegatesMap; // The registered delegates. Will not change after the queue has been diff --git a/chrome/browser/renderer_host/resource_request_details.h b/chrome/browser/renderer_host/resource_request_details.h index 36f3456..bdb87bf 100644 --- a/chrome/browser/renderer_host/resource_request_details.h +++ b/chrome/browser/renderer_host/resource_request_details.h @@ -19,12 +19,14 @@ #include "googleurl/src/gurl.h" #include "net/url_request/url_request_status.h" +namespace net { class URLRequest; +} // namespace net // Details about a resource request notification. class ResourceRequestDetails { public: - ResourceRequestDetails(const URLRequest* request, int cert_id); + ResourceRequestDetails(const net::URLRequest* request, int cert_id); virtual ~ResourceRequestDetails(); @@ -61,7 +63,7 @@ class ResourceRequestDetails { // Details about a redirection of a resource request. class ResourceRedirectDetails : public ResourceRequestDetails { public: - ResourceRedirectDetails(const URLRequest* request, + ResourceRedirectDetails(const net::URLRequest* request, int cert_id, const GURL& new_url); virtual ~ResourceRedirectDetails(); diff --git a/chrome/browser/renderer_host/x509_user_cert_resource_handler.h b/chrome/browser/renderer_host/x509_user_cert_resource_handler.h index ba6afb4..54b481d 100644 --- a/chrome/browser/renderer_host/x509_user_cert_resource_handler.h +++ b/chrome/browser/renderer_host/x509_user_cert_resource_handler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,8 +12,11 @@ #include "chrome/browser/renderer_host/resource_handler.h" #include "googleurl/src/gurl.h" -class ResourceDispatcherHost; +namespace net { class URLRequest; +} // namespace net + +class ResourceDispatcherHost; class URLRequestStatus; struct DownloadBuffer; @@ -24,7 +27,7 @@ struct DownloadBuffer; class X509UserCertResourceHandler : public ResourceHandler { public: X509UserCertResourceHandler(ResourceDispatcherHost* host, - URLRequest* request, + net::URLRequest* request, int render_process_host_id, int render_view_id); bool OnUploadProgress(int request_id, uint64 position, uint64 size); @@ -60,7 +63,7 @@ class X509UserCertResourceHandler : public ResourceHandler { GURL url_; ResourceDispatcherHost* host_; - URLRequest* request_; + net::URLRequest* request_; size_t content_length_; scoped_ptr<DownloadBuffer> buffer_; scoped_refptr<net::IOBuffer> read_buffer_; |