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
This commit is contained in:
Cheng Zhao 2016-05-23 19:49:43 +09:00
commit 9f858e1243
13 changed files with 94 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/api/atom_api_app.cc
View file

@ -375,12 +375,6 @@ void App::SetDesktopName(const std::string& desktop_name) {
#endif
}
void App::AllowNTLMCredentialsForAllDomains(bool should_allow) {
auto browser_context = static_cast<AtomBrowserContext*>(
AtomBrowserMainParts::Get()->browser_context());
browser_context->AllowNTLMCredentialsForAllDomains(should_allow);
}
std::string App::GetLocale() {
return l10n_util::GetApplicationLocale("");
}
@ -482,8 +476,6 @@ void App::BuildPrototype(
.SetMethod("setPath", &App::SetPath)
.SetMethod("getPath", &App::GetPath)
.SetMethod("setDesktopName", &App::SetDesktopName)
.SetMethod("allowNTLMCredentialsForAllDomains",
&App::AllowNTLMCredentialsForAllDomains)
.SetMethod("getLocale", &App::GetLocale)
#if defined(USE_NSS_CERTS)
.SetMethod("importCertificate", &App::ImportCertificate)