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

Errrrybody's a scoped_refptr now

Browse source
This commit is contained in:
joshaber 2017-03-31 13:53:42 -04:00
parent deae70de4d
commit 16cc79354c
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -813,7 +813,7 @@ void App::OnCertificateManagerModelCreated(
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
void App::ShowCertificateTrust(atom::NativeWindow* parent_window, void App::ShowCertificateTrust(atom::NativeWindow* parent_window,
const net::X509Certificate& cert, const scoped_refptr<net::X509Certificate>& cert,
std::string message, std::string message,
const ShowTrustCallback& callback, const ShowTrustCallback& callback,
mate::Arguments* args) { mate::Arguments* args) {
@ -960,7 +960,7 @@ void App::BuildPrototype(
base::Bind(&Browser::GetCurrentActivityType, browser)) base::Bind(&Browser::GetCurrentActivityType, browser))
.SetMethod("setAboutPanelOptions", .SetMethod("setAboutPanelOptions",
base::Bind(&Browser::SetAboutPanelOptions, browser)) base::Bind(&Browser::SetAboutPanelOptions, browser))
// .SetMethod("showCertificateTrust", &App::ShowCertificateTrust) .SetMethod("showCertificateTrust", &App::ShowCertificateTrust)
#endif #endif
#if defined(OS_WIN) #if defined(OS_WIN)
.SetMethod("setUserTasks", base::Bind(&Browser::SetUserTasks, browser)) .SetMethod("setUserTasks", base::Bind(&Browser::SetUserTasks, browser))

2
atom/browser/api/atom_api_app.h
View file

@ -156,7 +156,7 @@ class App : public AtomBrowserClient::Delegate,
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
void ShowCertificateTrust(atom::NativeWindow* parent_window, void ShowCertificateTrust(atom::NativeWindow* parent_window,
const net::X509Certificate& cert, const scoped_refptr<net::X509Certificate>& cert,
std::string message, std::string message,
const ShowTrustCallback& callback, const ShowTrustCallback& callback,
mate::Arguments* args); mate::Arguments* args);

3
atom/browser/api/atom_api_certificate_trust.h
View file

@ -8,6 +8,7 @@
#include <string> #include <string>
#include "base/callback_forward.h" #include "base/callback_forward.h"
#include "base/memory/ref_counted.h"
namespace net { namespace net {
class X509Certificate; class X509Certificate;
@ -22,7 +23,7 @@ namespace api {
typedef base::Callback<void(bool result)> ShowTrustCallback; typedef base::Callback<void(bool result)> ShowTrustCallback;
void ShowCertificateTrustUI(atom::NativeWindow* parent_window, void ShowCertificateTrustUI(atom::NativeWindow* parent_window,
const net::X509Certificate& cert, const scoped_refptr<net::X509Certificate>& cert,
std::string message, std::string message,
const ShowTrustCallback& callback); const ShowTrustCallback& callback);

4
atom/browser/api/atom_api_certificate_trust_mac.mm
View file

@ -21,12 +21,12 @@ namespace atom {
namespace api { namespace api {
void ShowCertificateTrustUI(atom::NativeWindow* parent_window, void ShowCertificateTrustUI(atom::NativeWindow* parent_window,
const net::X509Certificate& cert, const scoped_refptr<net::X509Certificate>& cert,
std::string message, std::string message,
const ShowTrustCallback& callback) { const ShowTrustCallback& callback) {
auto sec_policy = SecPolicyCreateBasicX509(); auto sec_policy = SecPolicyCreateBasicX509();
SecTrustRef trust = nullptr; SecTrustRef trust = nullptr;
SecTrustCreateWithCertificates(cert.CreateOSCertChainForCert(), sec_policy, &trust); SecTrustCreateWithCertificates(cert->CreateOSCertChainForCert(), sec_policy, &trust);
// CFRelease(sec_policy); // CFRelease(sec_policy);
NSWindow* window = parent_window ? NSWindow* window = parent_window ?