Remove ConstrainedWindowGtkDelegate

chrome/browser/ui/gtk/collected_cookies_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/collected_cookies_gtk.h"
 
 #include <string>
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
@@ skipping 103 matching lines @@
       TabSpecificContentSettings::FromWebContents(web_contents);
   registrar_.Add(this, chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN,
                  content::Source<TabSpecificContentSettings>(content_settings));
 
   Init();
 }
 
 void CollectedCookiesGtk::Init() {
   dialog_ = gtk_vbox_new(FALSE, ui::kContentAreaSpacing);
   gtk_box_set_spacing(GTK_BOX(dialog_), ui::kContentAreaSpacing);
+  g_signal_connect(dialog_, "destroy", G_CALLBACK(OnDestroyThunk), this);
 
   GtkWidget* label = gtk_label_new(
       l10n_util::GetStringUTF8(IDS_COLLECTED_COOKIES_DIALOG_TITLE).c_str());
   gtk_box_pack_start(GTK_BOX(dialog_), label, TRUE, TRUE, 0);
 
   notebook_ = gtk_notebook_new();
   gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook_), GTK_POS_TOP);
   gtk_box_pack_start(GTK_BOX(dialog_), notebook_, TRUE, TRUE, 0);
 
   GtkWidget* allowed_pane = CreateAllowedPane();
@@ skipping 49 matching lines @@
   gtk_button_set_label(GTK_BUTTON(close_button_),
                        l10n_util::GetStringUTF8(IDS_CLOSE).c_str());
   g_signal_connect(close_button_, "clicked", G_CALLBACK(OnCloseThunk), this);
   gtk_box_pack_end(GTK_BOX(button_box), close_button_, FALSE, TRUE, 0);
 
   // Show the dialog.
   allowed_cookies_tree_adapter_->Init();
   blocked_cookies_tree_adapter_->Init();
   EnableControls();
   ShowCookieInfo(gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_)));
-  window_ = CreateWebContentsModalDialogGtk(web_contents_, this);
+  window_ = CreateWebContentsModalDialogGtk(web_contents_,
+                                            dialog_,
+                                            close_button_);
 
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents_);
   web_contents_modal_dialog_manager->ShowDialog(window_);
 }
 
 GtkWidget* CollectedCookiesGtk::CreateAllowedPane() {
   GtkWidget* cookie_list_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
 
   GtkWidget* label = gtk_label_new(
@@ skipping 189 matching lines @@
   }
 
   g_list_foreach(paths, reinterpret_cast<GFunc>(gtk_tree_path_free), NULL);
   g_list_free(paths);
 }
 
 CollectedCookiesGtk::~CollectedCookiesGtk() {
   gtk_widget_destroy(dialog_);
 }
 
-GtkWidget* CollectedCookiesGtk::GetWidgetRoot() {
-  return dialog_;
-}
-
-GtkWidget* CollectedCookiesGtk::GetFocusWidget() {
-  return close_button_;
-}
-
-void CollectedCookiesGtk::DeleteDelegate() {
-  delete this;
-}
-
 bool CollectedCookiesGtk::SelectionContainsHostNode(
     GtkTreeSelection* selection, gtk_tree::TreeAdapter* adapter) {
   // Check whether at least one "origin" node is selected.
   GtkTreeModel* model;
   GList* paths =
       gtk_tree_selection_get_selected_rows(selection, &model);
   bool contains_host_node = false;
   for (GList* item = paths; item; item = item->next) {
     GtkTreeIter iter;
     gtk_tree_model_get_iter(
@@ skipping 118 matching lines @@
       tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this);
   gtk_tree_view_expand_row(GTK_TREE_VIEW(tree_view), path, TRUE);
   g_signal_handlers_unblock_by_func(
       tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this);
 }
 
 void CollectedCookiesGtk::OnTreeViewSelectionChange(GtkWidget* selection) {
   EnableControls();
   ShowCookieInfo(gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_)));
 }
+
+void CollectedCookiesGtk::OnDestroy(GtkWidget* widget) {
+  delete this;
+}