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

Fixed linter issues but now the code looks awful

Browse source
This commit is contained in:
Paul Betts 2015-10-19 13:12:17 -07:00
parent b3c7e2bf33
commit e3535d664b
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/atom_browser_context.cc
View file

@ -61,7 +61,7 @@ AtomBrowserContext::AtomBrowserContext(const std::string& partition,
bool in_memory)
: brightray::BrowserContext(partition, in_memory),
job_factory_(new AtomURLRequestJobFactory),
allow_ntlm_everywhere_(false) {
allow_ntlm_everywhere_(false) {
}
AtomBrowserContext::~AtomBrowserContext() {
@ -170,9 +170,11 @@ void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
}
bool AtomBrowserContext::AllowNTLMCredentialsForDomain(const GURL& auth_origin) {
bool AtomBrowserContext::AllowNTLMCredentialsForDomain
(const GURL& auth_origin) {
if (allow_ntlm_everywhere_) return true;
return brightray::URLRequestContextGetter::Delegate::AllowNTLMCredentialsForDomain(auth_origin);
return brightray::URLRequestContextGetter
::Delegate::AllowNTLMCredentialsForDomain(auth_origin);
}

6
atom/browser/atom_browser_context.h
View file

@ -19,7 +19,7 @@ class AtomBrowserContext : public brightray::BrowserContext {
public:
AtomBrowserContext(const std::string& partition, bool in_memory);
~AtomBrowserContext() override;
// brightray::URLRequestContextGetter::Delegate:
std::string GetUserAgent() override;
net::URLRequestJobFactory* CreateURLRequestJobFactory(
@ -36,7 +36,7 @@ class AtomBrowserContext : public brightray::BrowserContext {
// brightray::BrowserContext:
void RegisterPrefs(PrefRegistrySimple* pref_registry) override;
void AllowNTLMCredentialsForAllDomains(bool should_allow);
AtomURLRequestJobFactory* job_factory() const { return job_factory_; }
@ -47,7 +47,7 @@ class AtomBrowserContext : public brightray::BrowserContext {
// Managed by brightray::BrowserContext.
AtomURLRequestJobFactory* job_factory_;
bool allow_ntlm_everywhere_;
DISALLOW_COPY_AND_ASSIGN(AtomBrowserContext);