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

Fix assertions in Debug builds about using NetworkDelegate on the wrong thread

Browse source 
We have to create it on the IO thread.
This commit is contained in:
Adam Roben 2013-08-23 08:19:37 -04:00
parent 37679214d1
commit dcaaeacfe3
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
brightray/browser/url_request_context_getter.h
View file

@ -5,6 +5,7 @@
#ifndef BRIGHTRAY_BROWSER_URL_REQUEST_CONTEXT_GETTER_H_
#define BRIGHTRAY_BROWSER_URL_REQUEST_CONTEXT_GETTER_H_
#include "base/callback.h"
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "content/public/browser/content_browser_client.h"
@ -30,7 +31,7 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
const base::FilePath& base_path,
base::MessageLoop* io_loop,
base::MessageLoop* file_loop,
scoped_ptr<NetworkDelegate>,
base::Callback<scoped_ptr<NetworkDelegate>(void)>,
content::ProtocolHandlerMap*);
virtual ~URLRequestContextGetter();
@ -45,6 +46,8 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
base::MessageLoop* io_loop_;
base::MessageLoop* file_loop_;
base::Callback<scoped_ptr<NetworkDelegate>(void)> network_delegate_factory_;
scoped_ptr<net::ProxyConfigService> proxy_config_service_;
scoped_ptr<NetworkDelegate> network_delegate_;
scoped_ptr<net::URLRequestContextStorage> storage_;