Cancel client auth requests when not promptable.

chrome/browser/ui/views/ssl_client_certificate_selector.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/ssl_client_certificate_selector.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
+#include "components/web_modal/popup_manager.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/layout/grid_layout.h"
@@ skipping 52 matching lines @@
 void CertificateSelectorTableModel::SetObserver(
     ui::TableModelObserver* observer) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // SSLClientCertificateSelector:
 
 SSLClientCertificateSelector::SSLClientCertificateSelector(
     content::WebContents* web_contents,
     const scoped_refptr<net::SSLCertRequestInfo>& cert_request_info,
-    const chrome::SelectCertificateCallback& callback)
+    scoped_ptr<content::ClientCertificateDelegate> delegate)
     : SSLClientAuthObserver(web_contents->GetBrowserContext(),
-                            cert_request_info, callback),
+                            cert_request_info,
+                            delegate.Pass()),
       model_(new CertificateSelectorTableModel(cert_request_info.get())),
       web_contents_(web_contents),
       table_(NULL),
       view_cert_button_(NULL) {
   DVLOG(1) << __FUNCTION__;
 }
 
 SSLClientCertificateSelector::~SSLClientCertificateSelector() {
   table_->SetModel(NULL);
 }
@@ skipping 106 matching lines @@
                    cert));
 #else
     Unlocked(cert.get());
 #endif
     return false;  // Unlocked() will close the dialog.
   }
 
   return false;
 }
 
+bool SSLClientCertificateSelector::Close() {
+  DVLOG(1) << __FUNCTION__;
+  StopObserving();
+  CancelCertificateSelection();
+  return true;
+}
+
 views::View* SSLClientCertificateSelector::GetInitiallyFocusedView() {
   return table_;
 }
 
 views::View* SSLClientCertificateSelector::CreateExtraView() {
   DCHECK(!view_cert_button_);
   view_cert_button_ = new views::LabelButton(this,
       l10n_util::GetStringUTF16(IDS_PAGEINFO_CERT_INFO_BUTTON));
   view_cert_button_->SetStyle(views::Button::STYLE_BUTTON);
   return view_cert_button_;
@@ skipping 43 matching lines @@
   DVLOG(1) << __FUNCTION__;
   CertificateSelected(cert);
   GetWidget()->Close();
 }
 
 namespace chrome {
 
 void ShowSSLClientCertificateSelector(
     content::WebContents* contents,
     net::SSLCertRequestInfo* cert_request_info,
-    const chrome::SelectCertificateCallback& callback) {
+    scoped_ptr<content::ClientCertificateDelegate> delegate) {
   DVLOG(1) << __FUNCTION__ << " " << contents;
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  (new SSLClientCertificateSelector(
-       contents, cert_request_info, callback))->Init();
+
+  // Not all WebContentses can show modal dialogs.
+  //
+  // TODO(davidben): Move this hook to the WebContentsDelegate and only try to
+  // show a dialog in Browser's implementation. https://crbug.com/456255
+  if (web_modal::PopupManager::FromWebContents(contents) == nullptr) {
+    delegate->CancelCertificateSelection();
+    return;
+  }
+
+  (new SSLClientCertificateSelector(contents, cert_request_info,
+                                    delegate.Pass()))->Init();
 }
 
 }  // namespace chrome