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

chrome/browser/views/bookmark_manager_view.cc

Index: chrome/browser/views/bookmark_manager_view.cc
===================================================================
--- chrome/browser/views/bookmark_manager_view.cc	(revision 13572)
+++ chrome/browser/views/bookmark_manager_view.cc	(working copy)
@@ -716,14 +716,16 @@
   if (select_file_dialog_.get())
     select_file_dialog_->ListenerDestroyed();
 
-  std::wstring filter_string =
-      win_util::GetFileFilterFromExtensions(L"*.html;*.htm", true);
+  SelectFileDialog::FileTypeInfo file_type_info;
+  file_type_info.extensions.resize(1);
+  file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html"));
+  file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("htm"));
+  file_type_info.include_all_files = true;
   select_file_dialog_ = SelectFileDialog::Create(this);
   select_file_dialog_->SelectFile(
       SelectFileDialog::SELECT_OPEN_FILE, std::wstring(),
-      FilePath(FILE_PATH_LITERAL("bookmarks.html")), filter_string, 0,
-      std::wstring(),
-      GetWidget()->GetNativeView(),
+      FilePath(FILE_PATH_LITERAL("bookmarks.html")), &file_type_info, 0,
+      std::wstring(), GetWidget()->GetNativeView(),
       reinterpret_cast<void*>(IDS_BOOKMARK_MANAGER_IMPORT_MENU));
 }
 
@@ -731,11 +733,14 @@
   if (select_file_dialog_.get())
     select_file_dialog_->ListenerDestroyed();
 
+  SelectFileDialog::FileTypeInfo file_type_info;
+  file_type_info.extensions.resize(1);
+  file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html"));
+  file_type_info.include_all_files = true;
   select_file_dialog_ = SelectFileDialog::Create(this);
   select_file_dialog_->SelectFile(
       SelectFileDialog::SELECT_SAVEAS_FILE, std::wstring(),
-      FilePath(FILE_PATH_LITERAL("bookmarks.html")),
-      win_util::GetFileFilterFromPath(L"bookmarks.html"), 0, L"html",
-      GetWidget()->GetNativeView(),
+      FilePath(FILE_PATH_LITERAL("bookmarks.html")), &file_type_info, 0,
+      L"html", GetWidget()->GetNativeView(),
       reinterpret_cast<void*>(IDS_BOOKMARK_MANAGER_EXPORT_MENU));
 }