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

rename importClientCertificate => importCertificate

Browse source
This commit is contained in:
deepak1556 2016-04-20 08:45:49 +05:30
parent 2d8286515d
commit 794d120754
4 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -167,7 +167,7 @@ int ImportIntoCertStore(
base::string16 password;
net::CertificateList imported_certs;
int rv = -1;
options.GetString("clientCertificate", &cert_path);
options.GetString("certificate", &cert_path);
options.GetString("password", &password);
if (!cert_path.empty()) {
@ -405,7 +405,7 @@ bool App::MakeSingleInstance(
}
#if defined(USE_NSS_CERTS)
void App::ImportClientCertificate(
void App::ImportCertificate(
const base::DictionaryValue& options,
const net::CompletionCallback& callback) {
auto browser_context = AtomBrowserMainParts::Get()->browser_context();
@ -474,7 +474,7 @@ mate::ObjectTemplateBuilder App::GetObjectTemplateBuilder(
&App::AllowNTLMCredentialsForAllDomains)
.SetMethod("getLocale", &App::GetLocale)
#if defined(USE_NSS_CERTS)
.SetMethod("importClientCertificate", &App::ImportClientCertificate)
.SetMethod("importCertificate", &App::ImportCertificate)
#endif
.SetMethod("makeSingleInstance", &App::MakeSingleInstance);
}