| Index: webkit/glue/chrome_client_impl.cc
|
| diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc
|
| index 02e891d447b2a5a9aa3e4d41ad52e4fa0eeb3aeb..bfa6db431a8c0984adfa5ff36cba05ddb5063511 100644
|
| --- a/webkit/glue/chrome_client_impl.cc
|
| +++ b/webkit/glue/chrome_client_impl.cc
|
| @@ -52,17 +52,17 @@ class WebFileChooserCallbackImpl : public WebFileChooserCallback {
|
| : 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);
|
| }
|
|
|