diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-31 20:30:28 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:31:41 -0700 |
| commit | 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 (patch) | |
| tree | 382278a54ce7a744d62fa510a9a80688cc12434b /net/url_request/url_request_filter.cc | |
| parent | c4becdd46e31d261b930e4b5a539cbc1d45c23a6 (diff) | |
| download | external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.zip external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.gz external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.bz2 | |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
Diffstat (limited to 'net/url_request/url_request_filter.cc')
| -rw-r--r-- | net/url_request/url_request_filter.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/url_request/url_request_filter.cc b/net/url_request/url_request_filter.cc index d52fef5..a076d48 100644 --- a/net/url_request/url_request_filter.cc +++ b/net/url_request/url_request_filter.cc @@ -12,12 +12,7 @@ namespace net { URLRequestFilter* URLRequestFilter::shared_instance_ = NULL; -// static -URLRequestFilter* URLRequestFilter::GetInstance() { - if (!shared_instance_) - shared_instance_ = new URLRequestFilter; - return shared_instance_; -} +URLRequestFilter::~URLRequestFilter() {} // static net::URLRequestJob* URLRequestFilter::Factory(net::URLRequest* request, @@ -26,7 +21,12 @@ net::URLRequestJob* URLRequestFilter::Factory(net::URLRequest* request, return GetInstance()->FindRequestHandler(request, scheme); } -URLRequestFilter::~URLRequestFilter() {} +// static +URLRequestFilter* URLRequestFilter::GetInstance() { + if (!shared_instance_) + shared_instance_ = new URLRequestFilter; + return shared_instance_; +} void URLRequestFilter::AddHostnameHandler(const std::string& scheme, const std::string& hostname, net::URLRequest::ProtocolFactory* factory) { |