Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Unified Diff: net/url_request/url_request_ftp_job.h

Issue 12701011: [Net] Propagate priority changes from URLRequest to HttpTransaction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix use-after-free bug Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/url_request/url_request_ftp_job.h
diff --git a/net/url_request/url_request_ftp_job.h b/net/url_request/url_request_ftp_job.h
index 3b053c1e190ab61823a43babecdd196151b4807d..a7398913914ed37bf96c0ca9849553b8960487b3 100644
--- a/net/url_request/url_request_ftp_job.h
+++ b/net/url_request/url_request_ftp_job.h
@@ -9,6 +9,7 @@
#include "base/memory/weak_ptr.h"
#include "net/base/auth.h"
+#include "net/base/net_export.h"
#include "net/ftp/ftp_request_info.h"
#include "net/ftp/ftp_transaction.h"
#include "net/http/http_request_info.h"
@@ -25,7 +26,7 @@ class FtpAuthCache;
// A URLRequestJob subclass that is built on top of FtpTransaction. It
// provides an implementation for FTP.
-class URLRequestFtpJob : public URLRequestJob {
+class NET_EXPORT_PRIVATE URLRequestFtpJob : public URLRequestJob {
public:
URLRequestFtpJob(URLRequest* request,
NetworkDelegate* network_delegate,
@@ -37,15 +38,21 @@ class URLRequestFtpJob : public URLRequestJob {
NetworkDelegate* network_delegate,
const std::string& scheme);
+ protected:
+ virtual ~URLRequestFtpJob();
+
// Overridden from URLRequestJob:
virtual bool IsSafeRedirect(const GURL& location) OVERRIDE;
virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
virtual void GetResponseInfo(HttpResponseInfo* info) OVERRIDE;
virtual HostPortPair GetSocketAddress() const OVERRIDE;
+ virtual void SetPriority(RequestPriority priority) OVERRIDE;
+ virtual void Start() OVERRIDE;
+ virtual void Kill() OVERRIDE;
- private:
- virtual ~URLRequestFtpJob();
+ RequestPriority priority() const { return priority_; }
+ private:
void OnResolveProxyComplete(int result);
void StartFtpTransaction();
@@ -60,8 +67,6 @@ class URLRequestFtpJob : public URLRequestJob {
void LogFtpServerType(char server_type);
// Overridden from URLRequestJob:
- virtual void Start() OVERRIDE;
- virtual void Kill() OVERRIDE;
virtual LoadState GetLoadState() const OVERRIDE;
virtual bool NeedsAuth() OVERRIDE;
virtual void GetAuthChallengeInfo(
@@ -75,6 +80,8 @@ class URLRequestFtpJob : public URLRequestJob {
int buf_size,
int *bytes_read) OVERRIDE;
+ RequestPriority priority_;
+
ProxyInfo proxy_info_;
ProxyService::PacRequest* pac_request_;

Powered by Google App Engine
This is Rietveld 408576698