| 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_;
|
|
|
|
|