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

Upgrade brightray for new URLRequestContextGetter interface.

Browse source
This commit is contained in:
Cheng Zhao 2014-08-20 15:30:32 +08:00
parent 2bcb7393c4
commit af0a5744f2
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/atom_browser_context.cc
View file

@ -25,8 +25,7 @@ AtomBrowserContext::AtomBrowserContext()
AtomBrowserContext::~AtomBrowserContext() { AtomBrowserContext::~AtomBrowserContext() {
} }
scoped_ptr<net::URLRequestJobFactory> net::URLRequestJobFactory* AtomBrowserContext::CreateURLRequestJobFactory(
AtomBrowserContext::CreateURLRequestJobFactory(
content::ProtocolHandlerMap* handlers, content::ProtocolHandlerMap* handlers,
content::ProtocolHandlerScopedVector* interceptors) { content::ProtocolHandlerScopedVector* interceptors) {
scoped_ptr<AtomURLRequestJobFactory> job_factory(job_factory_); scoped_ptr<AtomURLRequestJobFactory> job_factory(job_factory_);
@ -52,7 +51,7 @@ AtomBrowserContext::CreateURLRequestJobFactory(
top_job_factory.Pass(), make_scoped_ptr(*it))); top_job_factory.Pass(), make_scoped_ptr(*it)));
interceptors->weak_clear(); interceptors->weak_clear();
return top_job_factory.Pass(); return top_job_factory.release();
} }
// static // static

4
atom/browser/atom_browser_context.h
View file

@ -22,8 +22,8 @@ class AtomBrowserContext : public brightray::BrowserContext {
AtomURLRequestJobFactory* job_factory() const { return job_factory_; } AtomURLRequestJobFactory* job_factory() const { return job_factory_; }
protected: protected:
// brightray::BrowserContext: // brightray::URLRequestContextGetter::Delegate:
virtual scoped_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory( virtual net::URLRequestJobFactory* CreateURLRequestJobFactory(
content::ProtocolHandlerMap* handlers, content::ProtocolHandlerMap* handlers,
content::ProtocolHandlerScopedVector* interceptors) OVERRIDE; content::ProtocolHandlerScopedVector* interceptors) OVERRIDE;

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit a3eba728efe6e80a5e0717f6889131519ab2b2f5 Subproject commit f0fe9b5a75fee01716589a9594c4d693d7e70ba4