Remove ConstrainedWindowGtkDelegate

chrome/browser/ui/gtk/login_prompt_gtk.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/login/login_prompt.h"
 
 #include <gtk/gtk.h>
 
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
@@ skipping 18 matching lines @@
 using content::PasswordForm;
 using content::WebContents;
 
 // ----------------------------------------------------------------------------
 // LoginHandlerGtk
 
 // This class simply forwards the authentication from the LoginView (on
 // the UI thread) to the net::URLRequest (on the I/O thread).
 // This class uses ref counting to ensure that it lives until all InvokeLaters
 // have been called.
-class LoginHandlerGtk : public LoginHandler,
-                        public ConstrainedWindowGtkDelegate {
+class LoginHandlerGtk : public LoginHandler {
  public:
   LoginHandlerGtk(net::AuthChallengeInfo* auth_info, net::URLRequest* request)
       : LoginHandler(auth_info, request),
         username_entry_(NULL),
         password_entry_(NULL),
         ok_(NULL),
         dialog_(NULL) {
   }
 
   // LoginModelObserver implementation.
@@ skipping 12 matching lines @@
     }
   }
 
   // LoginHandler:
   virtual void BuildViewForPasswordManager(
       PasswordManager* manager,
       const string16& explanation) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
     root_.Own(gtk_vbox_new(FALSE, ui::kContentAreaBorder));
+    g_signal_connect(root_.get(), "destroy", G_CALLBACK(OnDestroyThunk), this);
+
     GtkWidget* label = gtk_label_new(UTF16ToUTF8(explanation).c_str());
     gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
     gtk_box_pack_start(GTK_BOX(root_.get()), label, FALSE, FALSE, 0);
 
     username_entry_ = gtk_entry_new();
     gtk_entry_set_activates_default(GTK_ENTRY(username_entry_), TRUE);
 
     password_entry_ = gtk_entry_new();
     gtk_entry_set_activates_default(GTK_ENTRY(password_entry_), TRUE);
     gtk_entry_set_visibility(GTK_ENTRY(password_entry_), FALSE);
@@ skipping 26 matching lines @@
     SetModel(manager);
 
     // Scary thread safety note: This can potentially be called *after* SetAuth
     // or CancelAuth (say, if the request was cancelled before the UI thread got
     // control).  However, that's OK since any UI interaction in those functions
     // will occur via an InvokeLater on the UI thread, which is guaranteed
     // to happen after this is called (since this was InvokeLater'd first).
     WebContents* requesting_contents = GetWebContentsForLogin();
     DCHECK(requesting_contents);
 
-    dialog_ = CreateWebContentsModalDialogGtk(requesting_contents, this);
+    dialog_ = CreateWebContentsModalDialogGtk(requesting_contents,
+                                              root_.get(),
+                                              username_entry_);
 
     WebContentsModalDialogManager* web_contents_modal_dialog_manager =
         WebContentsModalDialogManager::FromWebContents(requesting_contents);
     web_contents_modal_dialog_manager->ShowDialog(dialog_);
 
     NotifyAuthNeeded();
   }
 
   virtual void CloseDialog() OVERRIDE {
     // The hosting dialog may have been freed.
     if (dialog_)
       gtk_widget_destroy(dialog_);
   }
 
-  // Overridden from ConstrainedWindowGtkDelegate:
-  virtual GtkWidget* GetWidgetRoot() OVERRIDE {
-    return root_.get();
-  }
-
-  virtual GtkWidget* GetFocusWidget() OVERRIDE {
-    return username_entry_;
-  }
-
-  virtual void DeleteDelegate() OVERRIDE {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-    // The constrained window is going to delete itself; clear our pointer.
-    dialog_ = NULL;
-    SetModel(NULL);
-
-    ReleaseSoon();
-  }
-
  protected:
   virtual ~LoginHandlerGtk() {
     root_.Destroy();
   }
 
  private:
   friend class LoginPrompt;
 
   CHROMEGTK_CALLBACK_0(LoginHandlerGtk, void, OnOKClicked);
   CHROMEGTK_CALLBACK_0(LoginHandlerGtk, void, OnCancelClicked);
   CHROMEGTK_CALLBACK_1(LoginHandlerGtk, void, OnPromptHierarchyChanged,
                        GtkWidget*);
+  CHROMEGTK_CALLBACK_0(LoginHandlerGtk, void, OnDestroy);
 
   // The GtkWidgets that form our visual hierarchy:
   // The root container we pass to our parent.
   ui::OwnedWidgetGtk root_;
 
   // GtkEntry widgets that the user types into.
   GtkWidget* username_entry_;
   GtkWidget* password_entry_;
   GtkWidget* ok_;
 
@@ skipping 23 matching lines @@
   // button the default action and mess with the focus.
   gtk_widget_set_can_default(ok_, TRUE);
   gtk_widget_grab_default(ok_);
 }
 
 // static
 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info,
                                    net::URLRequest* request) {
   return new LoginHandlerGtk(auth_info, request);
 }
+
+void LoginHandlerGtk::OnDestroy(GtkWidget* widget) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  // The web contents modal dialog is going to delete itself; clear our pointer.
+  dialog_ = NULL;
+  SetModel(NULL);
+
+  ReleaseSoon();
+}