diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 21:41:30 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 21:41:30 +0000 |
| commit | 84b604b1b6950eceb84e664d3e93567b6aab22b3 (patch) | |
| tree | c885d8b3c2b863948d77bf478d661ed397a176db /webkit | |
| parent | 43efc50cf60427e9c6cdc77116c5807fe66ee070 (diff) | |
| download | chromium_src-84b604b1b6950eceb84e664d3e93567b6aab22b3.zip chromium_src-84b604b1b6950eceb84e664d3e93567b6aab22b3.tar.gz chromium_src-84b604b1b6950eceb84e664d3e93567b6aab22b3.tar.bz2 | |
Remove the wstring versions of GetFileInfo, GetFileSize, GetTempDir.
TEST=compiles
BUG=24672
Review URL: http://codereview.chromium.org/1753004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_host.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc index 9724cd2..3cd13bd 100644 --- a/webkit/glue/plugins/plugin_host.cc +++ b/webkit/glue/plugins/plugin_host.cc @@ -438,20 +438,19 @@ static NPError PostURLNotify(NPP id, return NPERR_FILE_NOT_FOUND; std::string file_path_ascii(buf); - std::wstring file_path; + FilePath file_path; static const char kFileUrlPrefix[] = "file:"; if (StartsWithASCII(file_path_ascii, kFileUrlPrefix, false)) { GURL file_url(file_path_ascii); DCHECK(file_url.SchemeIsFile()); - FilePath path; - net::FileURLToFilePath(file_url, &path); - file_path = path.ToWStringHack(); + net::FileURLToFilePath(file_url, &file_path); } else { - file_path = base::SysNativeMBToWide(file_path_ascii); + file_path = FilePath::FromWStringHack( + base::SysNativeMBToWide(file_path_ascii)); } file_util::FileInfo post_file_info = {0}; - if (!file_util::GetFileInfo(file_path.c_str(), &post_file_info) || + if (!file_util::GetFileInfo(file_path, &post_file_info) || post_file_info.is_directory) return NPERR_FILE_NOT_FOUND; |