Monster FilePath patch!

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 34 matching lines @@
 using WebKit::WebMouseEvent;
 
 // Callback class that's given to the WebViewDelegate during a file choose
 // operation.
 class WebFileChooserCallbackImpl : public WebFileChooserCallback {
  public:
   WebFileChooserCallbackImpl(PassRefPtr<WebCore::FileChooser> file_chooser)
       : file_chooser_(file_chooser) {
   }
 
-  void OnFileChoose(const std::vector<std::wstring>& file_names) {
+  virtual void OnFileChoose(const std::vector<FilePath>& file_names) {
     if (file_names.empty()) {
       file_chooser_->chooseFile(WebCore::String(""));
     } else if (file_names.size() == 1) {
       file_chooser_->chooseFile(
-        webkit_glue::StdWStringToString(file_names.front()));
+          webkit_glue::FilePathStringToString(file_names.front().value()));
     } else {
       Vector<WebCore::String> paths;
-      for (std::vector<std::wstring>::const_iterator filename =
+      for (std::vector<FilePath>::const_iterator filename =
              file_names.begin(); filename != file_names.end(); ++filename) {
-        paths.append(webkit_glue::StdWStringToString(*filename));
+        paths.append(webkit_glue::FilePathStringToString((*filename).value()));
       }
       file_chooser_->chooseFiles(paths);
     }
   }
 
  private:
   RefPtr<WebCore::FileChooser> file_chooser_;
   DISALLOW_COPY_AND_ASSIGN(WebFileChooserCallbackImpl);
 };
 
@@ skipping 526 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_);
 }