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

Unified Diff: trunk/src/net/url_request/url_request_context.h

Issue 12605011: Revert 188912 "Removed static factories for data, ftp, file, and..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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: trunk/src/net/url_request/url_request_context.h
===================================================================
--- trunk/src/net/url_request/url_request_context.h (revision 188924)
+++ trunk/src/net/url_request/url_request_context.h (working copy)
@@ -19,6 +19,7 @@
#include "base/threading/non_thread_safe.h"
#include "net/base/net_export.h"
#include "net/base/net_log.h"
+#include "net/ftp/ftp_auth_cache.h"
#include "net/http/http_network_session.h"
#include "net/http/http_server_properties.h"
#include "net/http/transport_security_state.h"
@@ -29,6 +30,7 @@
class CertVerifier;
class CookieStore;
class FraudulentCertificateReporter;
+class FtpTransactionFactory;
class HostResolver;
class HttpAuthHandlerFactory;
class HttpTransactionFactory;
@@ -129,6 +131,14 @@
http_transaction_factory_ = factory;
}
+ // Gets the ftp transaction factory for this context.
+ FtpTransactionFactory* ftp_transaction_factory() const {
+ return ftp_transaction_factory_;
+ }
+ void set_ftp_transaction_factory(FtpTransactionFactory* factory) {
+ ftp_transaction_factory_ = factory;
+ }
+
void set_network_delegate(NetworkDelegate* network_delegate) {
network_delegate_ = network_delegate;
}
@@ -155,6 +165,15 @@
transport_security_state_ = state;
}
+ // Gets the FTP authentication cache for this context.
+ FtpAuthCache* ftp_auth_cache() const {
+#if !defined(DISABLE_FTP_SUPPORT)
+ return ftp_auth_cache_.get();
+#else
+ return NULL;
+#endif
+ }
+
// ---------------------------------------------------------------------------
// Legacy accessors that delegate to http_user_agent_settings_.
// TODO(pauljensen): Remove after all clients are updated to directly access
@@ -218,7 +237,11 @@
HttpUserAgentSettings* http_user_agent_settings_;
scoped_refptr<CookieStore> cookie_store_;
TransportSecurityState* transport_security_state_;
+#if !defined(DISABLE_FTP_SUPPORT)
+ scoped_ptr<FtpAuthCache> ftp_auth_cache_;
+#endif
HttpTransactionFactory* http_transaction_factory_;
+ FtpTransactionFactory* ftp_transaction_factory_;
const URLRequestJobFactory* job_factory_;
URLRequestThrottlerManager* throttler_manager_;
« no previous file with comments | « trunk/src/net/url_request/url_request_about_job.cc ('k') | trunk/src/net/url_request/url_request_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698