Remove ConstrainedWindowGtkDelegate

chrome/browser/ui/gtk/extensions/media_galleries_dialog_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/gtk/extensions/media_galleries_dialog_gtk.h"
 
 #include "base/auto_reset.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
@@ skipping 12 matching lines @@
       : controller_(controller),
         window_(NULL),
         confirm_(NULL),
         checkbox_container_(NULL),
         ignore_toggles_(false),
         accepted_(false) {
   InitWidgets();
 
   // May be NULL during tests.
   if (controller->web_contents()) {
-    window_ = CreateWebContentsModalDialogGtk(controller->web_contents(), this);
+    window_ = CreateWebContentsModalDialogGtk(controller->web_contents(),
+                                              contents_.get(),
+                                              confirm_);
 
     WebContentsModalDialogManager* web_contents_modal_dialog_manager =
         WebContentsModalDialogManager::FromWebContents(
             controller->web_contents());
     web_contents_modal_dialog_manager->ShowDialog(window_);
   }
 }
 
 MediaGalleriesDialogGtk::~MediaGalleriesDialogGtk() {
 }
 
 void MediaGalleriesDialogGtk::InitWidgets() {
   contents_.Own(gtk_vbox_new(FALSE, ui::kContentAreaSpacing));
+  g_signal_connect(contents_.get(),
+                   "destroy",
+                   G_CALLBACK(OnDestroyThunk),
+                   this);
 
   GtkWidget* header =
       gtk_util::CreateBoldLabel(UTF16ToUTF8(controller_->GetHeader()));
   gtk_box_pack_start(GTK_BOX(contents_.get()), header, FALSE, FALSE, 0);
 
   GtkWidget* subtext =
       gtk_label_new(UTF16ToUTF8(controller_->GetSubtext()).c_str());
   gtk_label_set_line_wrap(GTK_LABEL(subtext), TRUE);
   gtk_widget_set_size_request(subtext, 500, -1);
   gtk_box_pack_start(GTK_BOX(contents_.get()), subtext, FALSE, FALSE, 0);
@@ skipping 71 matching lines @@
     const MediaGalleryPrefInfo* gallery) {
   CheckboxMap::iterator iter = checkbox_map_.find(gallery);
   if (iter == checkbox_map_.end())
     return;
 
   base::AutoReset<bool> reset(&ignore_toggles_, true);
   gtk_widget_destroy(iter->second);
   checkbox_map_.erase(iter);
 }
 
-GtkWidget* MediaGalleriesDialogGtk::GetWidgetRoot() {
-  return contents_.get();
-}
-
-GtkWidget* MediaGalleriesDialogGtk::GetFocusWidget() {
-  return confirm_;
-}
-
-void MediaGalleriesDialogGtk::DeleteDelegate() {
-  controller_->DialogFinished(accepted_);
-}
-
 void MediaGalleriesDialogGtk::OnToggled(GtkWidget* widget) {
   if (confirm_)
     gtk_widget_set_sensitive(confirm_, TRUE);
 
   if (ignore_toggles_)
     return;
 
   for (CheckboxMap::const_iterator iter = checkbox_map_.begin();
        iter != checkbox_map_.end(); ++iter) {
     if (iter->second == widget) {
@@ skipping 13 matching lines @@
 
 void MediaGalleriesDialogGtk::OnConfirm(GtkWidget* widget) {
   accepted_ = true;
   gtk_widget_destroy(window_);
 }
 
 void MediaGalleriesDialogGtk::OnCancel(GtkWidget* widget) {
   gtk_widget_destroy(window_);
 }
 
+void MediaGalleriesDialogGtk::OnDestroy(GtkWidget* widget) {
+  controller_->DialogFinished(accepted_);
+}
+
 // MediaGalleriesDialogController ----------------------------------------------
 
 // static
 MediaGalleriesDialog* MediaGalleriesDialog::Create(
     MediaGalleriesDialogController* controller) {
   return new MediaGalleriesDialogGtk(controller);
 }
 
 }  // namespace chrome