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

webkit/glue/chrome_client_impl.cc

 // Copyright (c) 2006-2008 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 "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "Cursor.h"
@@ skipping 479 matching lines @@
 }
 
 void ChromeClientImpl::runOpenPanel(WebCore::Frame* frame,
   PassRefPtr<WebCore::FileChooser> fileChooser) {
   WebViewDelegate* delegate = webview_->delegate();
   if (!delegate)
     return;
 
   bool multiple_files = fileChooser->allowsMultipleFiles();
 
-  std::wstring suggestion;
+  FilePath suggestion;
   if (fileChooser->filenames().size() > 0)
-    suggestion = webkit_glue::StringToStdWString(fileChooser->filenames()[0]);
+    suggestion = FilePath(
+      webkit_glue::StringToFilePathString(fileChooser->filenames()[0]));
 
-  WebFileChooserCallbackImpl* chooser = new WebFileChooserCallbackImpl(fileChooser);
-  delegate->RunFileChooser(multiple_files, std::wstring(), suggestion,
-                           std::wstring(), chooser);
+  WebFileChooserCallbackImpl* chooser =
+      new WebFileChooserCallbackImpl(fileChooser);
+  delegate->RunFileChooser(multiple_files, string16(), suggestion, chooser);
 }
 
 void ChromeClientImpl::popupOpened(WebCore::PopupContainer* popup_container,
                                    const WebCore::IntRect& bounds,
                                    bool activatable,
                                    bool handle_external) {
   if (handle_external) {
     // We're going to handle the popup with native controls by the external
     // embedder.
     popupOpenedInternal(popup_container, bounds, activatable);
@@ skipping 79 matching lines @@
   WebViewDelegate* delegate = webview_->delegate();
   if (delegate)
     delegate->DisableSuddenTermination();
 }
 
 void ChromeClientImpl::formStateDidChange(const WebCore::Node*) {
   WebViewDelegate* delegate = webview_->delegate();
   if (delegate)
     delegate->OnNavStateChanged(webview_);
 }