Move it into dialog

atom/browser/api/atom_api_app.cc

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

atom/browser/api/atom_api_app.h

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

atom/browser/api/atom_api_certificate_trust.h

@@ -1,34 +0,0 @@
-// Copyright (c) 2017 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_API_ATOM_API_CERTIFICATE_TRUST_H_
-#define ATOM_BROWSER_API_ATOM_API_CERTIFICATE_TRUST_H_
-
-#include <string>
-
-#include "base/callback_forward.h"
-#include "base/memory/ref_counted.h"
-
-namespace net {
-class X509Certificate;
-}  // namespace net
-
-namespace atom {
-
-class NativeWindow;
-
-namespace api {
-
-typedef base::Callback<void(bool result)> ShowTrustCallback;
-
-void ShowCertificateTrustUI(atom::NativeWindow* parent_window,
-                            const scoped_refptr<net::X509Certificate>& cert,
-                            std::string message,
-                            const ShowTrustCallback& callback);
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_CERTIFICATE_TRUST_H_

atom/browser/api/atom_api_dialog.cc

@@ -8,11 +8,13 @@
 
 #include "atom/browser/api/atom_api_window.h"
 #include "atom/browser/native_window.h"
+#include "atom/browser/ui/certificate_trust.h"
 #include "atom/browser/ui/file_dialog.h"
 #include "atom/browser/ui/message_box.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/image_converter.h"
+#include "atom/common/native_mate_converters/net_converter.h"
 #include "native_mate/dictionary.h"
 
 #include "atom/common/node_includes.h"
@@ -119,6 +121,16 @@ void ShowSaveDialog(const file_dialog::DialogSettings& settings,
   }
 }
 
+// #if defined(OS_MACOSX)
+void ShowCertificateTrust(atom::NativeWindow* parent_window,
+                               const scoped_refptr<net::X509Certificate>& cert,
+                               std::string message,
+                               const certificate_trust::ShowTrustCallback& callback,
+                               mate::Arguments* args) {
+  certificate_trust::ShowCertificateTrust(parent_window, cert, message, callback);
+}
+// #endif
+
 void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context, void* priv) {
   mate::Dictionary dict(context->GetIsolate(), exports);
@@ -126,6 +138,9 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
   dict.SetMethod("showErrorBox", &atom::ShowErrorBox);
   dict.SetMethod("showOpenDialog", &ShowOpenDialog);
   dict.SetMethod("showSaveDialog", &ShowSaveDialog);
+// #if defined(OS_MACOSX)
+  dict.SetMethod("showCertificateTrustDialog", &ShowCertificateTrust);
+// #endif
 }
 
 }  // namespace

atom/browser/ui/certificate_trust.h

@@ -0,0 +1,29 @@
+// Copyright (c) 2017 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_UI_CERTIFICATE_TRUST_H_
+#define ATOM_BROWSER_UI_CERTIFICATE_TRUST_H_
+
+#include <string>
+
+#include "base/callback_forward.h"
+#include "base/memory/ref_counted.h"
+#include "net/cert/x509_certificate.h"
+
+namespace atom {
+class NativeWindow;
+}  // namespace atom
+
+namespace certificate_trust {
+
+typedef base::Callback<void(bool result)> ShowTrustCallback;
+
+void ShowCertificateTrust(atom::NativeWindow* parent_window,
+                          const scoped_refptr<net::X509Certificate>& cert,
+                          std::string message,
+                          const ShowTrustCallback& callback);
+
+}  // namespace certificate_trust
+
+#endif  // ATOM_BROWSER_UI_CERTIFICATE_TRUST_H_

atom/browser/ui/certificate_trust_mac.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/api/atom_api_certificate_trust.h"
+#include "atom/browser/ui/certificate_trust.h"
 
 #import <Cocoa/Cocoa.h>
 #import <CoreServices/CoreServices.h>
@@ -14,12 +14,11 @@
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
-#include "net/cert/x509_certificate.h"
 #include "net/cert/cert_database.h"
 
 @interface TrustDelegate : NSObject {
  @private
-  atom::api::ShowTrustCallback callback_;
+  certificate_trust::ShowTrustCallback callback_;
   SFCertificateTrustPanel* panel_;
   scoped_refptr<net::X509Certificate> cert_;
   SecTrustRef trust_;
@@ -27,7 +26,7 @@
   SecPolicyRef sec_policy_;
 }
 
-- (id)initWithCallback:(const atom::api::ShowTrustCallback&)callback
+- (id)initWithCallback:(const certificate_trust::ShowTrustCallback&)callback
       panel:(SFCertificateTrustPanel*)panel
       cert:(const scoped_refptr<net::X509Certificate>&)cert
       trust:(SecTrustRef)trust
@@ -51,7 +50,7 @@
   [super dealloc];
 }
 
-- (id)initWithCallback:(const atom::api::ShowTrustCallback&)callback
+- (id)initWithCallback:(const certificate_trust::ShowTrustCallback&)callback
       panel:(SFCertificateTrustPanel*)panel
       cert:(const scoped_refptr<net::X509Certificate>&)cert
       trust:(SecTrustRef)trust
@@ -86,14 +85,12 @@
 
 @end
 
-namespace atom {
+namespace certificate_trust {
 
-namespace api {
-
-void ShowCertificateTrustUI(atom::NativeWindow* parent_window,
-                            const scoped_refptr<net::X509Certificate>& cert,
-                            std::string message,
-                            const ShowTrustCallback& callback) {
+void ShowCertificateTrust(atom::NativeWindow* parent_window,
+                          const scoped_refptr<net::X509Certificate>& cert,
+                          std::string message,
+                          const ShowTrustCallback& callback) {
   auto sec_policy = SecPolicyCreateBasicX509();
   auto cert_chain = cert->CreateOSCertChainForCert();
   SecTrustRef trust = nullptr;
@@ -119,6 +116,4 @@ void ShowCertificateTrustUI(atom::NativeWindow* parent_window,
          message:msg];
 }
 
-}  // namespace api
-
-}  // namespace atom
+}  // namespace certificate_trust

filenames.gypi

@@ -103,8 +103,6 @@
       'atom/browser/api/atom_api_app.h',
       'atom/browser/api/atom_api_auto_updater.cc',
       'atom/browser/api/atom_api_auto_updater.h',
-      'atom/browser/api/atom_api_certificate_trust_mac.mm',
-      'atom/browser/api/atom_api_certificate_trust.h',
       'atom/browser/api/atom_api_content_tracing.cc',
       'atom/browser/api/atom_api_cookies.cc',
       'atom/browser/api/atom_api_cookies.h',
@@ -281,6 +279,8 @@
       'atom/browser/ui/accelerator_util_views.cc',
       'atom/browser/ui/atom_menu_model.cc',
       'atom/browser/ui/atom_menu_model.h',
+      'atom/browser/ui/certificate_trust_mac.mm',
+      'atom/browser/ui/certificate_trust.h',
       'atom/browser/ui/cocoa/atom_menu_controller.h',
       'atom/browser/ui/cocoa/atom_menu_controller.mm',
       'atom/browser/ui/cocoa/atom_touch_bar.h',