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

Merge branch 'master' into chrome51

Browse source 
Conflicts:
	browser/url_request_context_getter.cc
	browser/url_request_context_getter.h
This commit is contained in:
Cheng Zhao 2016-05-23 19:46:28 +09:00
commit e23ffd1694
2 changed files with 20 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

24
brightray/browser/url_request_context_getter.h
View file

@ -35,7 +35,7 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
public:
class Delegate {
public:
Delegate();
Delegate() {}
virtual ~Delegate() {}
virtual net::NetworkDelegate* CreateNetworkDelegate() { return NULL; }
@ -47,28 +47,6 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
const base::FilePath& base_path);
virtual std::unique_ptr<net::CertVerifier> CreateCertVerifier();
virtual net::SSLConfigService* CreateSSLConfigService();
virtual bool AllowNTLMCredentialsForDomain(const GURL& auth_origin);
virtual bool CanDelegateURLSecurity(const GURL& auth_origin);
private:
std::unique_ptr<net::URLSecurityManager> orig_url_sec_mgr_;
};
class DelegateURLSecurityManager : public net::URLSecurityManager {
public:
DelegateURLSecurityManager(URLRequestContextGetter::Delegate* delegate);
bool CanUseDefaultCredentials(const GURL& auth_origin) const override;
bool CanDelegate(const GURL& auth_origin) const override;
void SetDefaultWhitelist(
std::unique_ptr<net::HttpAuthFilter> whitelist_default) override;
void SetDelegateWhitelist(
std::unique_ptr<net::HttpAuthFilter> whitelist_delegate) override;
private:
URLRequestContextGetter::Delegate* delegate_;
DISALLOW_COPY_AND_ASSIGN(DelegateURLSecurityManager);
};
URLRequestContextGetter(