Refactoring; switch the |filter| parameter into something that is more amenable to cross-platform implementation.

BUG=9852

Review URL: http://codereview.chromium.org/63093

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13573 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 7 insertions, 12 deletions

diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index ef6ea8d..e50c032 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -1126,12 +1126,9 @@ void RenderViewHost::OnMsgPasteFromSelectionClipboard() {
 }
 
 void RenderViewHost::OnMsgRunFileChooser(bool multiple_files,
-                                         const std::wstring& title,
-                                         const std::wstring& default_file,
-                                         const std::wstring& filter) {
-  std::wstring real_filter = filter;
-  std::replace(real_filter.begin(), real_filter.end(), '|', '\0');
-  delegate_->RunFileChooser(multiple_files, title, default_file, real_filter);
+                                         const string16& title,
+                                         const FilePath& default_file) {
+  delegate_->RunFileChooser(multiple_files, title, default_file);
 }
 
 void RenderViewHost::OnMsgRunJavaScriptMessage(
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index 8d82ba3..e6e7ad11 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -511,9 +511,8 @@ class RenderViewHost : public RenderWidgetHost {
   void OnMsgSelectionChanged(const std::string& text);
   void OnMsgPasteFromSelectionClipboard();
   void OnMsgRunFileChooser(bool multiple_files,
-                           const std::wstring& title,
-                           const std::wstring& default_file,
-                           const std::wstring& filter);
+                           const string16& title,
+                           const FilePath& default_file);
   void OnMsgRunJavaScriptMessage(const std::wstring& message,
                                  const std::wstring& default_prompt,
                                  const GURL& frame_url,
diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h
index 7a9a94b..ebe8df1 100644
--- a/chrome/browser/renderer_host/render_view_host_delegate.h
+++ b/chrome/browser/renderer_host/render_view_host_delegate.h
@@ -283,9 +283,8 @@ class RenderViewHostDelegate {
 
   // A file chooser should be shown.
   virtual void RunFileChooser(bool multiple_files,
-                              const std::wstring& title,
-                              const std::wstring& default_file,
-                              const std::wstring& filter) { }
+                              const string16& title,
+                              const FilePath& default_file) { }
 
   // A javascript message, confirmation or prompt should be shown.
   virtual void RunJavaScriptMessage(const std::wstring& message,