diff options
| author | jar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-22 18:21:11 +0000 |
|---|---|---|
| committer | jar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-22 18:21:11 +0000 |
| commit | 0a00775a41bd90f4f01017362bac3aeadd6c953e (patch) | |
| tree | 26404f7422e9a56f6a955eb14c84d40a14da59ba /net/url_request/url_request_http_job.h | |
| parent | 968e176577ac4fe102ce66987eb97e037f67796f (diff) | |
| download | chromium_src-0a00775a41bd90f4f01017362bac3aeadd6c953e.zip chromium_src-0a00775a41bd90f4f01017362bac3aeadd6c953e.tar.gz chromium_src-0a00775a41bd90f4f01017362bac3aeadd6c953e.tar.bz2 | |
Rollback 2444 and 2443 to get linux and mac prep
Also need to augment sln dependencies
tbr
Review URL: http://codereview.chromium.org/3188
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_http_job.h')
| -rw-r--r-- | net/url_request/url_request_http_job.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h index 908db2c..9312e35 100644 --- a/net/url_request/url_request_http_job.h +++ b/net/url_request/url_request_http_job.h @@ -2,11 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_ -#define NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_ - -#include <string> -#include <vector> +#ifndef NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H__ +#define NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H__ #include "net/base/completion_callback.h" #include "net/http/http_request_info.h" @@ -27,7 +24,7 @@ class URLRequestHttpJob : public URLRequestJob { virtual ~URLRequestHttpJob(); protected: - explicit URLRequestHttpJob(URLRequest* request); + URLRequestHttpJob(URLRequest* request); // URLRequestJob methods: virtual void SetUpload(net::UploadData* upload); @@ -41,7 +38,7 @@ class URLRequestHttpJob : public URLRequestJob { virtual void GetResponseInfo(net::HttpResponseInfo* info); virtual bool GetResponseCookies(std::vector<std::string>* cookies); virtual int GetResponseCode(); - virtual bool GetContentEncodings(std::vector<std::string>* encoding_type); + virtual bool GetContentEncoding(std::string* encoding_type); virtual bool IsRedirectResponse(GURL* location, int* http_status_code); virtual bool IsSafeRedirect(const GURL& location); virtual bool NeedsAuth(); @@ -80,11 +77,12 @@ class URLRequestHttpJob : public URLRequestJob { bool read_in_progress_; - // Keep a reference to the url request context to be sure it's not deleted - // before us. + // Keep a reference to the url request context to be sure it's not + // deleted before us. scoped_refptr<URLRequestContext> context_; - DISALLOW_COPY_AND_ASSIGN(URLRequestHttpJob); + DISALLOW_EVIL_CONSTRUCTORS(URLRequestHttpJob); }; -#endif // NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_ +#endif // NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H__ + |