diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 12:17:21 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 12:17:21 +0000 |
| commit | 16c5c87e1296e597b259ad94d8eb7245bd7956a1 (patch) | |
| tree | 29f7962e3e2b8c5b4f5386baa7559067c3bea252 /chrome | |
| parent | 22f9708089b581832fa67bd77c7258b942b542bf (diff) | |
| download | chromium_src-16c5c87e1296e597b259ad94d8eb7245bd7956a1.zip chromium_src-16c5c87e1296e597b259ad94d8eb7245bd7956a1.tar.gz chromium_src-16c5c87e1296e597b259ad94d8eb7245bd7956a1.tar.bz2 | |
Get rid of FromWStringHack in select_file_dialog.cc
BUG=24672
TEST=trybots
Review URL: http://codereview.chromium.org/6193003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71314 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/views/select_file_dialog.cc | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/chrome/browser/ui/views/select_file_dialog.cc b/chrome/browser/ui/views/select_file_dialog.cc index 4ce6fa7..1570a9e 100644 --- a/chrome/browser/ui/views/select_file_dialog.cc +++ b/chrome/browser/ui/views/select_file_dialog.cc @@ -10,6 +10,7 @@ #include "base/json/json_reader.h" #include "base/scoped_ptr.h" #include "base/string_util.h" +#include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_list.h" @@ -263,8 +264,12 @@ void SelectFileDialogImpl::OnDialogClosed(FileBrowseDelegate* delegate, std::string path_string; if (dict->HasKey(kKeyNamePath) && dict->GetString(kKeyNamePath, &path_string)) { - FilePath path = FilePath::FromWStringHack(UTF8ToWide(path_string)); - +#if defined(OS_WIN) + FilePath path(base::SysUTF8ToWide(path_string)); +#else + FilePath path( + base::SysWideToNativeMB(base::SysUTF8ToWide(path_string))); +#endif listener_->FileSelected(path, kSaveCompletePageIndex, delegate->params_); notification_fired = true; @@ -280,8 +285,13 @@ void SelectFileDialogImpl::OnDialogClosed(FileBrowseDelegate* delegate, std::string path_string; if (paths_value->GetString(i, &path_string) && !path_string.empty()) { - paths.push_back(FilePath::FromWStringHack( - UTF8ToWide(path_string))); +#if defined(OS_WIN) + FilePath path(base::SysUTF8ToWide(path_string)); +#else + FilePath path( + base::SysWideToNativeMB(base::SysUTF8ToWide(path_string))); +#endif + paths.push_back(path); } } |