| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 5 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 : io_thread_delegate_(io_thread_delegate) { | 168 : io_thread_delegate_(io_thread_delegate) { |
| 169 DCHECK(io_thread_delegate_.get()); | 169 DCHECK(io_thread_delegate_.get()); |
| 170 DetachFromThread(); | 170 DetachFromThread(); |
| 171 } | 171 } |
| 172 | 172 |
| 173 ProtocolHandlerRegistry::JobInterceptorFactory::~JobInterceptorFactory() { | 173 ProtocolHandlerRegistry::JobInterceptorFactory::~JobInterceptorFactory() { |
| 174 } | 174 } |
| 175 | 175 |
| 176 void ProtocolHandlerRegistry::JobInterceptorFactory::Chain( | 176 void ProtocolHandlerRegistry::JobInterceptorFactory::Chain( |
| 177 scoped_ptr<net::URLRequestJobFactory> job_factory) { | 177 scoped_ptr<net::URLRequestJobFactory> job_factory) { |
| 178 job_factory_ = job_factory.Pass(); | 178 job_factory_ = std::move(job_factory); |
| 179 } | 179 } |
| 180 | 180 |
| 181 net::URLRequestJob* | 181 net::URLRequestJob* |
| 182 ProtocolHandlerRegistry::JobInterceptorFactory:: | 182 ProtocolHandlerRegistry::JobInterceptorFactory:: |
| 183 MaybeCreateJobWithProtocolHandler( | 183 MaybeCreateJobWithProtocolHandler( |
| 184 const std::string& scheme, | 184 const std::string& scheme, |
| 185 net::URLRequest* request, | 185 net::URLRequest* request, |
| 186 net::NetworkDelegate* network_delegate) const { | 186 net::NetworkDelegate* network_delegate) const { |
| 187 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 187 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 188 net::URLRequestJob* job = io_thread_delegate_->MaybeCreateJob( | 188 net::URLRequestJob* job = io_thread_delegate_->MaybeCreateJob( |
| (...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 966 | 966 |
| 967 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> | 967 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> |
| 968 ProtocolHandlerRegistry::CreateJobInterceptorFactory() { | 968 ProtocolHandlerRegistry::CreateJobInterceptorFactory() { |
| 969 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 969 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 970 // this is always created on the UI thread (in profile_io's | 970 // this is always created on the UI thread (in profile_io's |
| 971 // InitializeOnUIThread. Any method calls must be done | 971 // InitializeOnUIThread. Any method calls must be done |
| 972 // on the IO thread (this is checked). | 972 // on the IO thread (this is checked). |
| 973 return scoped_ptr<JobInterceptorFactory>( | 973 return scoped_ptr<JobInterceptorFactory>( |
| 974 new JobInterceptorFactory(io_thread_delegate_.get())); | 974 new JobInterceptorFactory(io_thread_delegate_.get())); |
| 975 } | 975 } |
| OLD | NEW |