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

Set up our browser context to use new delegate-based API

Browse source
This commit is contained in:
Paul Betts 2015-10-19 13:03:20 -07:00
parent b958982d99
commit 489090fcf8
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/atom_browser_context.cc
View file

@ -60,8 +60,8 @@ std::string RemoveWhitespace(const std::string& str) {
AtomBrowserContext::AtomBrowserContext(const std::string& partition, AtomBrowserContext::AtomBrowserContext(const std::string& partition,
bool in_memory) bool in_memory)
: brightray::BrowserContext(partition, in_memory), : brightray::BrowserContext(partition, in_memory),
job_factory_(new AtomURLRequestJobFactory) { job_factory_(new AtomURLRequestJobFactory),
} allow_ntlm_everywhere_(false) : { }
AtomBrowserContext::~AtomBrowserContext() { AtomBrowserContext::~AtomBrowserContext() {
} }
@ -168,6 +168,12 @@ void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
base::FilePath()); base::FilePath());
} }
bool AtomBrowserContext::AllowNTLMCredentialsForDomain(const GURL& auth_origin) {
if (allow_ntlm_everywhere_) return true;
return brightray::URLRequestContextGetter::Delegate::AllowNTLMCredentialsForDomain(auth_origin);
}
} // namespace atom } // namespace atom
namespace brightray { namespace brightray {

3
atom/browser/atom_browser_context.h
View file

@ -28,6 +28,7 @@ class AtomBrowserContext : public brightray::BrowserContext {
net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory( net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
const base::FilePath& base_path) override; const base::FilePath& base_path) override;
net::SSLConfigService* CreateSSLConfigService() override; net::SSLConfigService* CreateSSLConfigService() override;
bool AllowNTLMCredentialsForDomain(const GURL& auth_origin) override;
// content::BrowserContext: // content::BrowserContext:
content::DownloadManagerDelegate* GetDownloadManagerDelegate() override; content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
@ -44,6 +45,8 @@ class AtomBrowserContext : public brightray::BrowserContext {
// Managed by brightray::BrowserContext. // Managed by brightray::BrowserContext.
AtomURLRequestJobFactory* job_factory_; AtomURLRequestJobFactory* job_factory_;
bool allow_ntlm_everywhere_;
DISALLOW_COPY_AND_ASSIGN(AtomBrowserContext); DISALLOW_COPY_AND_ASSIGN(AtomBrowserContext);
}; };