Refactoring; switch the |filter| parameter into something that is more amenab...

chrome/browser/gtk/dialogs_gtk.cc

 // Copyright (c) 2009 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_path.h"
 #include "base/logging.h"
@@ skipping 12 matching lines @@
  public:
   explicit SelectFileDialogImpl(Listener* listener);
   virtual ~SelectFileDialogImpl();
 
   // BaseShellDialog implementation.
   virtual bool IsRunning(gfx::NativeWindow parent_window) const;
   virtual void ListenerDestroyed();
 
   // SelectFileDialog implementation.
   // |params| is user data we pass back via the Listener interface.
-  virtual void SelectFile(Type type, const string16& title,
+  virtual void SelectFile(Type type,
+                          const string16& title,
                           const FilePath& default_path,
-                          const std::wstring& filter,
-                          int filter_index,
+                          const FileTypeInfo* file_types,
+                          int file_type_index,
                           const FilePath::StringType& default_extension,
-                          gfx::NativeWindow parent_window,
+                          gfx::NativeWindow owning_window,
                           void* params);
 
  private:
   // Notifies the listener that a single file was chosen.
   void FileSelected(GtkWidget* dialog, const FilePath& path);
 
   // Notifies the listener that multiple files were chosen.
   void MultiFilesSelected(GtkWidget* dialog,
                           const std::vector<FilePath>& files);
 
@@ skipping 58 matching lines @@
 }
 
 bool SelectFileDialogImpl::IsRunning(gfx::NativeWindow parent_window) const {
   return parents_.find(parent_window) != parents_.end();
 }
 
 void SelectFileDialogImpl::ListenerDestroyed() {
   listener_ = NULL;
 }
 
-// We ignore |filter| and |default_extension|.
-// TODO(estade): use |filter|.
+// We ignore |file_types| and |default_extension|.
+// TODO(estade): use |file_types|.
 void SelectFileDialogImpl::SelectFile(
     Type type,
     const string16& title,
     const FilePath& default_path,
-    const std::wstring& filter,
-    int filter_index,
+    const FileTypeInfo* file_types,
+    int file_type_index,
     const FilePath::StringType& default_extension,
-    gfx::NativeWindow parent_window,
+    gfx::NativeWindow owning_window,
     void* params) {
   // TODO(estade): on windows, parent_window may be null. But I'm not sure when
   // that's used and how to deal with it here. For now, don't allow it.
-  DCHECK(parent_window);
-  parents_.insert(parent_window);
+  DCHECK(owning_window);
+  parents_.insert(owning_window);
 
   std::string title_string = UTF16ToUTF8(title);
 
   GtkWidget* dialog = NULL;
   switch (type) {
     case SELECT_OPEN_FILE:
       DCHECK(default_path.empty());
-      dialog = CreateFileOpenDialog(title_string, parent_window);
+      dialog = CreateFileOpenDialog(title_string, owning_window);
       break;
     case SELECT_OPEN_MULTI_FILE:
       DCHECK(default_path.empty());
-      dialog = CreateMultiFileOpenDialog(title_string, parent_window);
+      dialog = CreateMultiFileOpenDialog(title_string, owning_window);
       break;
     case SELECT_SAVEAS_FILE:
-      dialog = CreateSaveAsDialog(title_string, default_path, parent_window);
+      dialog = CreateSaveAsDialog(title_string, default_path, owning_window);
       break;
     default:
       NOTIMPLEMENTED() << "Dialog type " << type << " not implemented.";
       return;
   }
 
   params_map_[dialog] = params;
   gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
   gtk_widget_show_all(dialog);
 }
@@ skipping 125 matching lines @@
   GSList* filenames = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog));
   std::vector<FilePath> filenames_fp;
   for (GSList* iter = filenames; iter != NULL; iter = g_slist_next(iter)) {
     filenames_fp.push_back(FilePath(static_cast<char*>(iter->data)));
     g_free(iter->data);
   }
 
   g_slist_free(filenames);
   dialog_impl->MultiFilesSelected(dialog, filenames_fp);
 }