Remove knowledge about SSLClientAuthHandler from chrome. Instead a callback is given to the embed...

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/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
+#include "net/base/ssl_cert_request_info.h"
 #include "net/base/x509_certificate.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/gfx/native_widget_types.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
@@ skipping 53 matching lines @@
 
 void CertificateSelectorTableModel::SetObserver(
     ui::TableModelObserver* observer) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // SSLClientCertificateSelector:
 
 SSLClientCertificateSelector::SSLClientCertificateSelector(
     TabContentsWrapper* wrapper,
+    const net::HttpNetworkSession* network_session,
     net::SSLCertRequestInfo* cert_request_info,
-    SSLClientAuthHandler* delegate)
-    : SSLClientAuthObserver(cert_request_info, delegate),
-      cert_request_info_(cert_request_info),
-      delegate_(delegate),
+    const base::Callback<void(net::X509Certificate*)>& callback)
+    : SSLClientAuthObserver(network_session, cert_request_info, callback),
       model_(new CertificateSelectorTableModel(cert_request_info)),
       wrapper_(wrapper),
       window_(NULL),
       table_(NULL),
       view_cert_button_(NULL),
       view_cert_button_container_(NULL) {
   DVLOG(1) << __FUNCTION__;
 }
 
 SSLClientCertificateSelector::~SSLClientCertificateSelector() {
   table_->SetModel(NULL);
 }
 
 void SSLClientCertificateSelector::Init() {
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
   const int column_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
   column_set->AddColumn(
       views::GridLayout::FILL, views::GridLayout::FILL,
       1, views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, column_set_id);
   string16 text = l10n_util::GetStringFUTF16(
       IDS_CLIENT_CERT_DIALOG_TEXT,
-      ASCIIToUTF16(cert_request_info_->host_and_port));
+      ASCIIToUTF16(cert_request_info()->host_and_port));
   views::Label* label = new views::Label(text);
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   label->SetAllowCharacterBreak(true);
   layout->AddView(label);
 
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   CreateCertTable();
   layout->StartRow(1, column_set_id);
@@ skipping 11 matching lines @@
 
   // Select the first row automatically.  This must be done after the dialog has
   // been created.
   table_->Select(0);
 }
 
 net::X509Certificate* SSLClientCertificateSelector::GetSelectedCert() const {
   int selected = table_->FirstSelectedRow();
   if (selected >= 0 &&
       selected < static_cast<int>(
-          cert_request_info_->client_certs.size()))
-    return cert_request_info_->client_certs[selected];
+          cert_request_info()->client_certs.size()))
+    return cert_request_info()->client_certs[selected];
   return NULL;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // SSLClientAuthObserver implementation:
 
 void SSLClientCertificateSelector::OnCertSelectedByNotification() {
   DVLOG(1) << __FUNCTION__;
-  delegate_ = NULL;
   DCHECK(window_);
   window_->CloseConstrainedWindow();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DialogDelegateView implementation:
 
 bool SSLClientCertificateSelector::CanResize() const {
   return true;
 }
@@ skipping 10 matching lines @@
 bool SSLClientCertificateSelector::IsDialogButtonEnabled(
     ui::DialogButton button) const {
   if (button == ui::DIALOG_BUTTON_OK)
     return !!GetSelectedCert();
   return true;
 }
 
 bool SSLClientCertificateSelector::Cancel() {
   DVLOG(1) << __FUNCTION__;
   StopObserving();
-  if (delegate_) {
-    delegate_->CertificateSelected(NULL);
-    delegate_ = NULL;
-  }
+  CertificateSelected(NULL);
 
   return true;
 }
 
 bool SSLClientCertificateSelector::Accept() {
   DVLOG(1) << __FUNCTION__;
   net::X509Certificate* cert = GetSelectedCert();
   if (cert) {
     StopObserving();
-    delegate_->CertificateSelected(GetSelectedCert());
-    delegate_ = NULL;
-
+    CertificateSelected(cert);
     return true;
   }
 
   return false;
 }
 
 views::View* SSLClientCertificateSelector::GetInitiallyFocusedView() {
   return table_;
 }
 
@@ skipping 63 matching lines @@
   layout->AddView(view_cert_button_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // SSLClientCertificateSelector public interface:
 
 namespace browser {
 
 void ShowNativeSSLClientCertificateSelector(
     TabContentsWrapper* wrapper,
+    const net::HttpNetworkSession* network_session,
     net::SSLCertRequestInfo* cert_request_info,
-    SSLClientAuthHandler* delegate) {
+    const base::Callback<void(net::X509Certificate*)>& callback) {
   DVLOG(1) << __FUNCTION__ << " " << wrapper;
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  (new SSLClientCertificateSelector(wrapper,
-                                   cert_request_info,
-                                   delegate))->Init();
+  (new SSLClientCertificateSelector(
+       wrapper, network_session, cert_request_info, callback))->Init();
 }
 
 #if !defined(USE_NSS) && !defined(USE_OPENSSL)
 // The webui version of the SSL client cert selector is excluded from the build
 // under these conditions.  Add stub implementation for the required method.
 void ShowSSLClientCertificateSelector(
     TabContentsWrapper* wrapper,
+    const net::HttpNetworkSession* network_session,
     net::SSLCertRequestInfo* cert_request_info,
-    SSLClientAuthHandler* delegate) {
-  ShowNativeSSLClientCertificateSelector(wrapper, cert_request_info, delegate);
+    const base::Callback<void(net::X509Certificate*)>& callback) {
+  ShowNativeSSLClientCertificateSelector(
+      wrapper, network_session, cert_request_info, callback);
 }
 #endif
 
 }  // namespace browser