mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Pass ProtocolHandlerScopedVector by value.

Browse source
This commit is contained in:
Cheng Zhao 2014-08-13 16:16:01 +08:00
parent b95b621dfc
commit 604361f93d
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
brightray/browser/browser_context.cc
View file

@ -123,7 +123,7 @@ scoped_ptr<NetworkDelegate> BrowserContext::CreateNetworkDelegate() {
scoped_ptr<net::URLRequestJobFactory> BrowserContext::CreateURLRequestJobFactory( scoped_ptr<net::URLRequestJobFactory> BrowserContext::CreateURLRequestJobFactory(
const content::ProtocolHandlerMap& protocol_handlers, const content::ProtocolHandlerMap& protocol_handlers,
const content::ProtocolHandlerScopedVector& protocol_interceptors) { content::ProtocolHandlerScopedVector protocol_interceptors) {
return scoped_ptr<net::URLRequestJobFactory>(); return scoped_ptr<net::URLRequestJobFactory>();
} }

2
brightray/browser/browser_context.h
View file

@ -51,7 +51,7 @@ class BrowserContext : public content::BrowserContext {
// implementation. // implementation.
virtual scoped_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory( virtual scoped_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
const content::ProtocolHandlerMap& protocol_handlers, const content::ProtocolHandlerMap& protocol_handlers,
const content::ProtocolHandlerScopedVector& protocol_interceptors); content::ProtocolHandlerScopedVector protocol_interceptors);
virtual base::FilePath GetPath() const OVERRIDE; virtual base::FilePath GetPath() const OVERRIDE;

2
brightray/browser/url_request_context_getter.cc
View file

@ -153,7 +153,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
// Give user a chance to create their own job factory. // Give user a chance to create their own job factory.
scoped_ptr<net::URLRequestJobFactory> user_job_factory( scoped_ptr<net::URLRequestJobFactory> user_job_factory(
job_factory_factory_.Run(protocol_handlers_, protocol_interceptors_)); job_factory_factory_.Run(protocol_handlers_, protocol_interceptors_.Pass()));
if (user_job_factory) { if (user_job_factory) {
storage_->set_job_factory(user_job_factory.release()); storage_->set_job_factory(user_job_factory.release());
protocol_handlers_.clear(); protocol_handlers_.clear();

2
brightray/browser/url_request_context_getter.h
View file

@ -27,7 +27,7 @@ class NetworkDelegate;
typedef base::Callback<scoped_ptr<net::URLRequestJobFactory>( typedef base::Callback<scoped_ptr<net::URLRequestJobFactory>(
const content::ProtocolHandlerMap& protocol_handlers, const content::ProtocolHandlerMap& protocol_handlers,
const content::ProtocolHandlerScopedVector& protocol_interceptors)> URLRequestJobFactoryFactory; content::ProtocolHandlerScopedVector protocol_interceptors)> URLRequestJobFactoryFactory;
class URLRequestContextGetter : public net::URLRequestContextGetter { class URLRequestContextGetter : public net::URLRequestContextGetter {
public: public: