| 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..d80fc826914e41b0ca542982c14f07264695561e 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 {
|
| public:
|
| SSLClientCertificateSelector(
|
| content::WebContents* web_contents,
|
| @@ -46,42 +34,17 @@ class SSLClientCertificateSelector : public SSLClientAuthObserver,
|
|
|
| void Init();
|
|
|
| - net::X509Certificate* GetSelectedCert() const;
|
| -
|
| - // SSLClientAuthObserver implementation:
|
| + // SSLClientAuthObserver:
|
| void OnCertSelectedByNotification() override;
|
|
|
| - // DialogDelegateView:
|
| - bool CanResize() const override;
|
| - base::string16 GetWindowTitle() const override;
|
| - void DeleteDelegate() override;
|
| - bool IsDialogButtonEnabled(ui::DialogButton button) const override;
|
| + // chrome::CertificateSelector:
|
| 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 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);
|
| };
|
|
|
|
|