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

Unified Diff: trunk/src/net/url_request/url_request_context_builder.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_builder.h
===================================================================
--- trunk/src/net/url_request/url_request_context_builder.h (revision 188924)
+++ trunk/src/net/url_request/url_request_context_builder.h (working copy)
@@ -25,7 +25,6 @@
namespace net {
-class FtpTransactionFactory;
class HostMappingRules;
class ProxyConfigService;
class URLRequestContext;
@@ -83,22 +82,10 @@
user_agent_ = user_agent;
}
- // Control support for data:// requests. By default it's disabled.
- void set_data_enabled(bool enable) {
- data_enabled_ = enable;
- }
-
- // Control support for file:// requests. By default it's disabled.
- void set_file_enabled(bool enable) {
- file_enabled_ = enable;
- }
-
-#if !defined(DISABLE_FTP_SUPPORT)
- // Control support for ftp:// requests. By default it's disabled.
+ // By default it's disabled.
void set_ftp_enabled(bool enable) {
ftp_enabled_ = enable;
}
-#endif
// Uses BasicNetworkDelegate by default. Note that calling Build will unset
// any custom delegate in builder, so this must be called each time before
@@ -127,14 +114,7 @@
private:
std::string accept_language_;
std::string user_agent_;
- // Include support for data:// requests.
- bool data_enabled_;
- // Include support for file:// requests.
- bool file_enabled_;
-#if !defined(DISABLE_FTP_SUPPORT)
- // Include support for ftp:// requests.
bool ftp_enabled_;
-#endif
bool http_cache_enabled_;
HttpCacheParams http_cache_params_;
HttpNetworkSessionParams http_network_session_params_;
@@ -142,7 +122,6 @@
scoped_ptr<ProxyConfigService> proxy_config_service_;
#endif // defined(OS_LINUX) || defined(OS_ANDROID)
scoped_ptr<NetworkDelegate> network_delegate_;
- scoped_ptr<FtpTransactionFactory> ftp_transaction_factory_;
DISALLOW_COPY_AND_ASSIGN(URLRequestContextBuilder);
};
« no previous file with comments | « trunk/src/net/url_request/url_request_context.cc ('k') | trunk/src/net/url_request/url_request_context_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698