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

Expose the certificate trust panel as part of app

Browse source
This commit is contained in:
joshaber 2017-03-30 17:25:55 -04:00
parent 64369cd07f
commit 653b2d15c3
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "atom/browser/api/atom_api_certificate_trust.h"
#include "atom/browser/api/atom_api_menu.h" #include "atom/browser/api/atom_api_menu.h"
#include "atom/browser/api/atom_api_session.h" #include "atom/browser/api/atom_api_session.h"
#include "atom/browser/api/atom_api_web_contents.h" #include "atom/browser/api/atom_api_web_contents.h"
@ -810,6 +811,16 @@ void App::OnCertificateManagerModelCreated(
} }
#endif #endif
#if defined(OS_MACOSX)
void App::ShowCertificateTrust(atom::NativeWindow* parent_window,
const net::X509Certificate& cert,
std::string message,
const ShowTrustCallback& callback,
mate::Arguments* args) {
ShowCertificateTrustUI(parent_window, cert, message, callback);
}
#endif
#if defined(OS_WIN) #if defined(OS_WIN)
v8::Local<v8::Value> App::GetJumpListSettings() { v8::Local<v8::Value> App::GetJumpListSettings() {
JumpList jump_list(Browser::Get()->GetAppUserModelID()); JumpList jump_list(Browser::Get()->GetAppUserModelID());
@ -949,6 +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)
#endif #endif
#if defined(OS_WIN) #if defined(OS_WIN)
.SetMethod("setUserTasks", base::Bind(&Browser::SetUserTasks, browser)) .SetMethod("setUserTasks", base::Bind(&Browser::SetUserTasks, browser))

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

@ -8,6 +8,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "atom/browser/api/atom_api_certificate_trust.h"
#include "atom/browser/api/event_emitter.h" #include "atom/browser/api/event_emitter.h"
#include "atom/browser/atom_browser_client.h" #include "atom/browser/atom_browser_client.h"
#include "atom/browser/browser.h" #include "atom/browser/browser.h"
@ -19,6 +20,7 @@
#include "content/public/browser/gpu_data_manager_observer.h" #include "content/public/browser/gpu_data_manager_observer.h"
#include "native_mate/handle.h" #include "native_mate/handle.h"
#include "net/base/completion_callback.h" #include "net/base/completion_callback.h"
#include "net/cert/x509_certificate.h"
#if defined(USE_NSS_CERTS) #if defined(USE_NSS_CERTS)
#include "chrome/browser/certificate_manager_model.h" #include "chrome/browser/certificate_manager_model.h"
@ -151,6 +153,15 @@ class App : public AtomBrowserClient::Delegate,
std::unique_ptr<CertificateManagerModel> certificate_manager_model_; std::unique_ptr<CertificateManagerModel> certificate_manager_model_;
#endif #endif
#if defined(OS_MACOSX)
void ShowCertificateTrust(atom::NativeWindow* parent_window,
const net::X509Certificate& cert,
std::string message,
const ShowTrustCallback& callback,
mate::Arguments* args);
#endif
// Tracks tasks requesting file icons. // Tracks tasks requesting file icons.
base::CancelableTaskTracker cancelable_task_tracker_; base::CancelableTaskTracker cancelable_task_tracker_;