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

Unified Diff: net/url_request/url_request_context.h

Issue 10880071: Disable FTP on iOS (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: After rebasing Created 8 years, 4 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
« no previous file with comments | « net/net.gyp ('k') | net/url_request/url_request_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_context.h
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 38635405e5e1124ddaef2830c89812787dbb966b..8e8e3cc902e499d98b25fa0d0a964bfa7c77e9b1 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -160,7 +160,13 @@ class NET_EXPORT URLRequestContext
}
// Gets the FTP authentication cache for this context.
- FtpAuthCache* ftp_auth_cache() const { return ftp_auth_cache_.get(); }
+ FtpAuthCache* ftp_auth_cache() const {
+#if !defined(DISABLE_FTP_SUPPORT)
+ return ftp_auth_cache_.get();
+#else
+ return NULL;
+#endif
+ }
// Gets the value of 'Accept-Charset' header field.
const std::string& accept_charset() const { return accept_charset_; }
@@ -227,7 +233,9 @@ class NET_EXPORT URLRequestContext
HttpServerProperties* http_server_properties_;
scoped_refptr<CookieStore> cookie_store_;
TransportSecurityState* transport_security_state_;
+#if !defined(DISABLE_FTP_SUPPORT)
scoped_ptr<FtpAuthCache> ftp_auth_cache_;
+#endif
std::string accept_language_;
std::string accept_charset_;
// The charset of the referrer where this request comes from. It's not
« no previous file with comments | « net/net.gyp ('k') | net/url_request/url_request_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698