diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 10:17:12 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 10:17:12 +0000 |
commit | 72cbd32707a2ede460bcc1b3cb199e653282a8ed (patch) | |
tree | d212d36fbd064fd4b8c5783a9002f235c98d7a2d /webkit/glue/chrome_client_impl.cc | |
parent | 2fe25aac3d317086338a761e3b040cbcffc3a873 (diff) | |
download | chromium_src-72cbd32707a2ede460bcc1b3cb199e653282a8ed.zip chromium_src-72cbd32707a2ede460bcc1b3cb199e653282a8ed.tar.gz chromium_src-72cbd32707a2ede460bcc1b3cb199e653282a8ed.tar.bz2 |
Switching things to FilePath:
Remove following deprecated wstring-using functions:
net/net_util: FilePathToFileURL
net/net_util: FileURLToFilePath
Switch net/base/upload_data to FilePath.
Switch upload-related parts of net/url_request/url_request to FilePath.
Made necessary adjustments in rest of code (a lot).
Review URL: http://codereview.chromium.org/63011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/chrome_client_impl.cc')
-rw-r--r-- | webkit/glue/chrome_client_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc index 02e891d..bfa6db4 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); } |