Remove ConstrainedWindowGtkDelegate

chrome/browser/ui/gtk/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/ssl/ssl_client_certificate_selector.h"
 
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
@@ skipping 25 matching lines @@
 
 namespace {
 
 enum {
   RESPONSE_SHOW_CERT_INFO = 1,
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // SSLClientCertificateSelector
 
-class SSLClientCertificateSelector : public SSLClientAuthObserver,
-                                     public ConstrainedWindowGtkDelegate {
+class SSLClientCertificateSelector : public SSLClientAuthObserver {
  public:
   explicit SSLClientCertificateSelector(
       WebContents* parent,
       const net::HttpNetworkSession* network_session,
       net::SSLCertRequestInfo* cert_request_info,
       const base::Callback<void(net::X509Certificate*)>& callback);
   virtual ~SSLClientCertificateSelector();
 
   void Show();
 
   // SSLClientAuthObserver implementation:
   virtual void OnCertSelectedByNotification() OVERRIDE;
 
-  // ConstrainedWindowGtkDelegate implementation:
-  virtual GtkWidget* GetWidgetRoot() OVERRIDE { return root_widget_.get(); }
-  virtual GtkWidget* GetFocusWidget() OVERRIDE;
-  virtual void DeleteDelegate() OVERRIDE;
-
  private:
   void PopulateCerts();
 
   net::X509Certificate* GetSelectedCert();
 
   static std::string FormatComboBoxText(
       net::X509Certificate::OSCertHandle cert,
       const std::string& nickname);
   static std::string FormatDetailsText(
       net::X509Certificate::OSCertHandle cert);
 
   // Callback after unlocking certificate slot.
   void Unlocked();
 
   CHROMEGTK_CALLBACK_0(SSLClientCertificateSelector, void, OnComboBoxChanged);
   CHROMEGTK_CALLBACK_0(SSLClientCertificateSelector, void, OnViewClicked);
   CHROMEGTK_CALLBACK_0(SSLClientCertificateSelector, void, OnCancelClicked);
   CHROMEGTK_CALLBACK_0(SSLClientCertificateSelector, void, OnOkClicked);
   CHROMEGTK_CALLBACK_1(SSLClientCertificateSelector, void, OnPromptShown,
                        GtkWidget*);
+  CHROMEGTK_CALLBACK_0(SSLClientCertificateSelector, void, OnDestroy);
 
   std::vector<std::string> details_strings_;
 
   GtkWidget* cert_combo_box_;
   GtkTextBuffer* cert_details_buffer_;
 
   ui::OwnedWidgetGtk root_widget_;
   // Hold on to the select button to focus it.
   GtkWidget* select_button_;
 
   WebContents* web_contents_;
   GtkWidget* window_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLClientCertificateSelector);
 };
 
 SSLClientCertificateSelector::SSLClientCertificateSelector(
     WebContents* web_contents,
     const net::HttpNetworkSession* network_session,
     net::SSLCertRequestInfo* cert_request_info,
     const base::Callback<void(net::X509Certificate*)>& callback)
     : SSLClientAuthObserver(network_session, cert_request_info, callback),
       web_contents_(web_contents),
       window_(NULL) {
   root_widget_.Own(gtk_vbox_new(FALSE, ui::kControlSpacing));
+  g_signal_connect(root_widget_.get(),
+                   "destroy",
+                   G_CALLBACK(OnDestroyThunk),
+                   this);
 
   GtkWidget* site_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(root_widget_.get()), site_vbox,
                      FALSE, FALSE, 0);
 
   GtkWidget* site_description_label = gtk_util::CreateBoldLabel(
       l10n_util::GetStringUTF8(IDS_CERT_SELECTOR_SITE_DESCRIPTION_LABEL));
   gtk_box_pack_start(GTK_BOX(site_vbox), site_description_label,
                      FALSE, FALSE, 0);
 
@@ skipping 70 matching lines @@
 
   StartObserving();
 }
 
 SSLClientCertificateSelector::~SSLClientCertificateSelector() {
   root_widget_.Destroy();
 }
 
 void SSLClientCertificateSelector::Show() {
   DCHECK(!window_);
-  window_ = CreateWebContentsModalDialogGtk(web_contents_, this);
+  window_ = CreateWebContentsModalDialogGtk(web_contents_,
+                                            root_widget_.get(),
+                                            select_button_);
 
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents_);
   web_contents_modal_dialog_manager->ShowDialog(window_);
 }
 
 void SSLClientCertificateSelector::OnCertSelectedByNotification() {
   DCHECK(window_);
   gtk_widget_destroy(window_);
 }
 
-GtkWidget* SSLClientCertificateSelector::GetFocusWidget() {
-  return select_button_;
-}
-
-void SSLClientCertificateSelector::DeleteDelegate() {
-  // The dialog was closed by escape key.
-  StopObserving();
-  CertificateSelected(NULL);
-  delete this;
-}
-
 void SSLClientCertificateSelector::PopulateCerts() {
   std::vector<std::string> nicknames;
   x509_certificate_model::GetNicknameStringsFromCertList(
       cert_request_info()->client_certs,
       l10n_util::GetStringUTF8(IDS_CERT_SELECTOR_CERT_EXPIRED),
       l10n_util::GetStringUTF8(IDS_CERT_SELECTOR_CERT_NOT_YET_VALID),
       &nicknames);
 
   DCHECK_EQ(nicknames.size(),
             cert_request_info()->client_certs.size());
@@ skipping 144 matching lines @@
 
 void SSLClientCertificateSelector::OnPromptShown(GtkWidget* widget,
                                                  GtkWidget* previous_toplevel) {
   if (!root_widget_.get() ||
       !gtk_widget_is_toplevel(gtk_widget_get_toplevel(root_widget_.get())))
     return;
   gtk_widget_set_can_default(select_button_, TRUE);
   gtk_widget_grab_default(select_button_);
 }
 
+void SSLClientCertificateSelector::OnDestroy(GtkWidget* widget) {
+  // The dialog was closed by escape key.
+  StopObserving();
+  CertificateSelected(NULL);
+  delete this;
+}
+
 }  // namespace
 
 namespace chrome {
 
 void ShowSSLClientCertificateSelector(
     content::WebContents* contents,
     const net::HttpNetworkSession* network_session,
     net::SSLCertRequestInfo* cert_request_info,
     const base::Callback<void(net::X509Certificate*)>& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   (new SSLClientCertificateSelector(
       contents, network_session, cert_request_info, callback))->Show();
 }
 
 }  // namespace chrome