Use the Native Certificate Viewer on MacOS even on MacViews

BUG=766926 Change-Id: I6d0302763687bbb4fe30682684ad85a2ac79f782 Reviewed-on: https://chromium-review.googlesource.com/1145674 Reviewed-by: Elly Fong-Jones <[email protected]> Commit-Queue: Robert Liao <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#577201}(cherry picked from commit 7fbbd5f) Reviewed-on: https://chromium-review.googlesource.com/1148610 Reviewed-by: Robert Liao <[email protected]> Cr-Commit-Position: refs/branch-heads/3497@{#51} Cr-Branched-From: 271eaf5-refs/heads/master@{#576753}
nwjs · Jul 24, 2018 · 5d64a46 · 5d64a46
1 parent f37fee3
commit 5d64a46
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc
@@ -142,14 +142,11 @@ void ShowSSLClientCertificateSelector(
     net::ClientCertIdentityList client_certs,
     std::unique_ptr<content::ClientCertificateDelegate> delegate) {
 #if defined(OS_MACOSX)
-  // TODO(ellyjones): Always use the Cocoa cert selector, even in Views builds.
-  // See also https://crbug.com/804950.
-  if (views_mode_controller::IsViewsBrowserCocoa()) {
-    return ShowSSLClientCertificateSelectorCocoa(contents, cert_request_info,
-                                                 std::move(client_certs),
-                                                 std::move(delegate));
-  }
-#endif
+  return ShowSSLClientCertificateSelectorCocoa(contents, cert_request_info,
+                                               std::move(client_certs),
+                                               std::move(delegate));
+#else   // defined(OS_MACOSX)
+
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // Not all WebContentses can show modal dialogs.
@@ -164,6 +161,7 @@ void ShowSSLClientCertificateSelector(
       std::move(delegate));
   selector->Init();
   selector->Show();
+#endif  // defined(OS_MACOSX)
 }
 
 }  // namespace chrome