Fix DELETE_EVENT handling in 3 places.

chrome/browser/ui/gtk/dialogs_gtk.cc

 // Copyright (c) 2011 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 <gtk/gtk.h>
 #include <map>
 #include <set>
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 65 matching lines @@
   GtkWidget* CreateMultiFileOpenDialog(const std::string& title,
       const FilePath& default_path, gfx::NativeWindow parent);
 
   GtkWidget* CreateSaveAsDialog(const std::string& title,
       const FilePath& default_path, gfx::NativeWindow parent);
 
   // Removes and returns the |params| associated with |dialog| from
   // |params_map_|.
   void* PopParamsForDialog(GtkWidget* dialog);
 
-  // Take care of internal data structures when a file dialog is destroyed.
-  void FileDialogDestroyed(GtkWidget* dialog);
-
   // Check whether response_id corresponds to the user cancelling/closing the
   // dialog. Used as a helper for the below callbacks.
   bool IsCancelResponse(gint response_id);
 
   // Common function for OnSelectSingleFileDialogResponse and
   // OnSelectSingleFolderDialogResponse.
   void SelectSingleFileHelper(GtkWidget* dialog,
                               gint response_id,
                               bool allow_folder);
 
@@ skipping 128 matching lines @@
       dialog = CreateMultiFileOpenDialog(title_string, default_path,
                                          owning_window);
       break;
     case SELECT_SAVEAS_FILE:
       dialog = CreateSaveAsDialog(title_string, default_path, owning_window);
       break;
     default:
       NOTREACHED();
       return;
   }
+  g_object_ref(dialog);
   dialogs_.insert(dialog);
 
   preview_ = gtk_image_new();
   g_signal_connect(dialog, "destroy",
                    G_CALLBACK(OnFileChooserDestroyThunk), this);
   g_signal_connect(dialog, "update-preview",
                    G_CALLBACK(OnUpdatePreviewThunk), this);
   gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(dialog), preview_);
 
   params_map_[dialog] = params;
@@ skipping 67 matching lines @@
     NOTREACHED();
 
   if (listener_) {
     GtkFileFilter* selected_filter =
         gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(dialog));
     GSList* filters = gtk_file_chooser_list_filters(GTK_FILE_CHOOSER(dialog));
     int idx = g_slist_index(filters, selected_filter);
     g_slist_free(filters);
     listener_->FileSelected(path, idx + 1, PopParamsForDialog(dialog));
   }
+
   gtk_widget_destroy(dialog);
 }
 
 void SelectFileDialogImpl::MultiFilesSelected(GtkWidget* dialog,
     const std::vector<FilePath>& files) {
   *last_opened_path_ = files[0].DirName();
 
   if (listener_)
     listener_->MultiFilesSelected(files, PopParamsForDialog(dialog));
   gtk_widget_destroy(dialog);
 }
 
 void SelectFileDialogImpl::FileNotSelected(GtkWidget* dialog) {
   void* params = PopParamsForDialog(dialog);
   if (listener_)
     listener_->FileSelectionCanceled(params);
-  gtk_widget_destroy(dialog);
+  // In the GTK_RESPONSE_DELETE_EVENT case, the dialog will have already been
+  // destroyed.
+  if (dialogs_.find(dialog) != dialogs_.end())
+    gtk_widget_destroy(dialog);
 }
 
 bool SelectFileDialogImpl::CallDirectoryExistsOnUIThread(const FilePath& path) {
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   return file_util::DirectoryExists(path);
 }
 
 GtkWidget* SelectFileDialogImpl::CreateFileOpenHelper(
     const std::string& title,
     const FilePath& default_path,
@@ skipping 110 matching lines @@
 }
 
 void* SelectFileDialogImpl::PopParamsForDialog(GtkWidget* dialog) {
   std::map<GtkWidget*, void*>::iterator iter = params_map_.find(dialog);
   DCHECK(iter != params_map_.end());
   void* params = iter->second;
   params_map_.erase(iter);
   return params;
 }
 
-void SelectFileDialogImpl::FileDialogDestroyed(GtkWidget* dialog) {
-  dialogs_.erase(dialog);
-
-  // Parent may be NULL in a few cases: 1) on shutdown when
-  // AllBrowsersClosed() trigger this handler after all the browser
-  // windows got destroyed, or 2) when the parent tab has been opened by
-  // 'Open Link in New Tab' context menu on a downloadable item and
-  // the tab has no content (see the comment in SelectFile as well).
-  GtkWindow* parent = gtk_window_get_transient_for(GTK_WINDOW(dialog));
-  if (!parent)
-    return;
-  std::set<GtkWindow*>::iterator iter = parents_.find(parent);
-  if (iter != parents_.end())
-    parents_.erase(iter);
-  else
-    NOTREACHED();
-}
-
 bool SelectFileDialogImpl::IsCancelResponse(gint response_id) {
   bool is_cancel = response_id == GTK_RESPONSE_CANCEL ||
                    response_id == GTK_RESPONSE_DELETE_EVENT;
   if (is_cancel)
     return true;
 
   DCHECK(response_id == GTK_RESPONSE_ACCEPT);
   return false;
 }
 
@@ skipping 59 matching lines @@
   g_slist_free(filenames);
 
   if (filenames_fp.empty()) {
     FileNotSelected(dialog);
     return;
   }
   MultiFilesSelected(dialog, filenames_fp);
 }
 
 void SelectFileDialogImpl::OnFileChooserDestroy(GtkWidget* dialog) {
-  FileDialogDestroyed(dialog);
+  dialogs_.erase(dialog);
+
+  // Parent may be NULL in a few cases: 1) on shutdown when
+  // AllBrowsersClosed() trigger this handler after all the browser
+  // windows got destroyed, or 2) when the parent tab has been opened by
+  // 'Open Link in New Tab' context menu on a downloadable item and
+  // the tab has no content (see the comment in SelectFile as well).
+  GtkWindow* parent = gtk_window_get_transient_for(GTK_WINDOW(dialog));
+  if (!parent)
+    return;
+  std::set<GtkWindow*>::iterator iter = parents_.find(parent);
+  if (iter != parents_.end())
+    parents_.erase(iter);
+  else
+    NOTREACHED();
 }
 
 void SelectFileDialogImpl::OnUpdatePreview(GtkWidget* chooser) {
   gchar* filename = gtk_file_chooser_get_preview_filename(
       GTK_FILE_CHOOSER(chooser));
   if (!filename)
     return;
   // This will preserve the image's aspect ratio.
   GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file_at_size(filename, kPreviewWidth,
                                                        kPreviewHeight, NULL);
   g_free(filename);
   if (pixbuf) {
     gtk_image_set_from_pixbuf(GTK_IMAGE(preview_), pixbuf);
     g_object_unref(pixbuf);
   }
   gtk_file_chooser_set_preview_widget_active(GTK_FILE_CHOOSER(chooser),
                                              pixbuf ? TRUE : FALSE);
 }