estade@ review feedback on r175674

chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.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 <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <map>
 #include <set>
 #include <vector>
 
 // Xlib defines RootWindow
 #undef RootWindow
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/libgtk2ui/gtk2_signal.h"
 #include "chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h"
 #include "grit/ui_strings.h"
 #include "ui/aura/root_window.h"
@@ skipping 15 matching lines @@
   // display server ever happens. Otherwise, this will crash.
   XSetTransientForHint(GDK_WINDOW_XDISPLAY(gdk_window),
                        GDK_WINDOW_XID(gdk_window),
                        parent->GetRootWindow()->GetAcceleratedWidget());
 
   // We also set the |parent| as a property of |dialog|, so that we can unlink
   // the two later.
   g_object_set_data(G_OBJECT(dialog), kAuraTransientParent, parent);
 }
 
-// Makes sure that .jpg also shows .JPG. |data| is a std::string* in disguise.
+// Makes sure that .jpg also shows .JPG.
 gboolean FileFilterCaseInsensitive(const GtkFileFilterInfo* file_info,
-                                   gpointer data) {
-  std::string* file_extension = reinterpret_cast<std::string*>(data);
+                                   std::string* file_extension) {
   return EndsWith(file_info->filename, *file_extension, false);
 }
 
 // Deletes |data| when gtk_file_filter_add_custom() is done with it.
-void OnFileFilterDataDestroyed(gpointer data) {
-  delete reinterpret_cast<std::string*>(data);
+void OnFileFilterDataDestroyed(std::string* file_extension) {
+  delete file_extension;
 }
 
 }  // namespace
 
 namespace libgtk2ui {
 
 // Implementation of SelectFileDialog that shows a Gtk common dialog for
 // choosing a file or folder. This acts as a modal dialog.
 class SelectFileDialogImplGTK : public SelectFileDialogImpl,
                                 public aura::WindowObserver {
@@ skipping 205 matching lines @@
 void SelectFileDialogImplGTK::AddFilters(GtkFileChooser* chooser) {
   for (size_t i = 0; i < file_types_.extensions.size(); ++i) {
     GtkFileFilter* filter = NULL;
     std::set<std::string> fallback_labels;
 
     for (size_t j = 0; j < file_types_.extensions[i].size(); ++j) {
       const std::string& current_extension = file_types_.extensions[i][j];
       if (!current_extension.empty()) {
         if (!filter)
           filter = gtk_file_filter_new();
-        // |file_extension| is freed in |OnFileFilterDataDestroyed()|.
-        std::string* file_extension = new std::string("." + current_extension);
-        gtk_file_filter_add_custom(filter,
-                                   GTK_FILE_FILTER_FILENAME,
-                                   &FileFilterCaseInsensitive,
-                                   reinterpret_cast<gpointer>(file_extension),
-                                   &OnFileFilterDataDestroyed);
+        scoped_ptr<std::string> file_extension(
+            new std::string("." + current_extension));
         fallback_labels.insert(std::string("*").append(*file_extension));
+        gtk_file_filter_add_custom(
+            filter,
+            GTK_FILE_FILTER_FILENAME,
+            reinterpret_cast<GtkFileFilterFunc>(FileFilterCaseInsensitive),
+            file_extension.release(),
+            reinterpret_cast<GDestroyNotify>(OnFileFilterDataDestroyed));
       }
     }
     // We didn't find any non-empty extensions to filter on.
     if (!filter)
       continue;
 
     // The description vector may be blank, in which case we are supposed to
     // use some sort of default description based on the filter.
     if (i < file_types_.extension_description_overrides.size()) {
       gtk_file_filter_set_name(filter, UTF16ToUTF8(
@@ skipping 301 matching lines @@
   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);
 }
 
 }  // namespace libgtk2ui