Refactor SSLClientCertificateSelector for reuse with platformKeys API.

chrome/browser/ui/views/ssl_client_certificate_selector.h

Index: chrome/browser/ui/views/ssl_client_certificate_selector.h
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.h b/chrome/browser/ui/views/ssl_client_certificate_selector.h
index de4fbed4bffbf4aa25163267776bff05652bbe0c..7c2618923c8ef94a9592526249e25dfc3c8d07d3 100644
--- a/chrome/browser/ui/views/ssl_client_certificate_selector.h
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector.h
@@ -5,38 +5,26 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_SSL_CLIENT_CERTIFICATE_SELECTOR_H_
 #define CHROME_BROWSER_UI_VIEWS_SSL_CLIENT_CERTIFICATE_SELECTOR_H_
 
-#include <string>
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/strings/string16.h"
+#include "base/macros.h"
 #include "chrome/browser/ssl/ssl_client_auth_observer.h"
 #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
-#include "ui/views/controls/button/button.h"
-#include "ui/views/controls/table/table_view_observer.h"
-#include "ui/views/window/dialog_delegate.h"
+#include "chrome/browser/ui/views/certificate_selector.h"
 
 // This header file exists only for testing.  Chrome should access the
 // certificate selector only through the cross-platform interface
 // chrome/browser/ssl_client_certificate_selector.h.
 
+namespace content {
+class WebContents;
+}
+
 namespace net {
 class SSLCertRequestInfo;
 class X509Certificate;
 }
 
-namespace views {
-class LabelButton;
-class TableView;
-class Widget;
-}
-
-class CertificateSelectorTableModel;
-
-class SSLClientCertificateSelector : public SSLClientAuthObserver,
-                                     public views::DialogDelegateView,
-                                     public views::ButtonListener,
-                                     public views::TableViewObserver {
+class SSLClientCertificateSelector : public chrome::CertificateSelector,
+                                     public SSLClientAuthObserver {

[davidben, 2015/02/18 20:32:02]

Neither of these base classes is much of a pure interface, and it took me a bit
to follow what was going on there. Ownership of dialogs is odd and we do
override Accept on it, so perhaps embed SSLClientAuthObserver and give it a
callback for OnCertSelectedByNotification?

This was already true before though, so this is maybe should be left for a
follow-up.

[pneubeck (no reviews), 2015/02/19 15:12:24]

Acknowledged.

  public:
   SSLClientCertificateSelector(
       content::WebContents* web_contents,
@@ -45,43 +33,22 @@ class SSLClientCertificateSelector : public SSLClientAuthObserver,
   ~SSLClientCertificateSelector() override;
 
   void Init();
+  net::X509Certificate* GetSelectedCertForTesting() const;
 
-  net::X509Certificate* GetSelectedCert() const;
-
-  // SSLClientAuthObserver implementation:
+  // SSLClientAuthObserver:
   void OnCertSelectedByNotification() override;
 
   // DialogDelegateView:

[davidben, 2015/02/18 20:32:01]

chrome::CertificatorSelector:

[pneubeck (no reviews), 2015/02/19 15:12:24]

Done.

-  bool CanResize() const override;
-  base::string16 GetWindowTitle() const override;
-  void DeleteDelegate() override;
-  bool IsDialogButtonEnabled(ui::DialogButton button) const override;
-  bool Cancel() override;
   bool Accept() override;
-  views::View* GetInitiallyFocusedView() override;
-  views::View* CreateExtraView() override;
-  ui::ModalType GetModalType() const override;
-
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
-  // views::TableViewObserver:
-  void OnSelectionChanged() override;
-  void OnDoubleClick() override;
 
  private:
+  void OnCertificateSelected(
+      const scoped_refptr<net::X509Certificate>& selected_cert);
   void CreateCertTable();
 
   // Callback after unlocking certificate slot.
   void Unlocked(net::X509Certificate* cert);
 
-  scoped_ptr<CertificateSelectorTableModel> model_;
-
-  content::WebContents* web_contents_;
-
-  views::TableView* table_;
-  views::LabelButton* view_cert_button_;
-
   DISALLOW_COPY_AND_ASSIGN(SSLClientCertificateSelector);
 };