diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-05 23:59:36 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-05 23:59:36 +0000 |
| commit | 5e207883834dc8a2ea39684e79e6b29d46c4013b (patch) | |
| tree | f63a447bff245151fc8b1d1f6a061b429e5708d2 /base/file_util.cc | |
| parent | 345e1b89c38bf19ebce483ae5392474bbf63ae59 (diff) | |
| download | chromium_src-5e207883834dc8a2ea39684e79e6b29d46c4013b.zip chromium_src-5e207883834dc8a2ea39684e79e6b29d46c4013b.tar.gz chromium_src-5e207883834dc8a2ea39684e79e6b29d46c4013b.tar.bz2 | |
Keep trying to undo 7564.
tbr=jhawkins
Review URL: http://codereview.chromium.org/17062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util.cc')
| -rw-r--r-- | base/file_util.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/base/file_util.cc b/base/file_util.cc index f0d66b5..fe33c32 100644 --- a/base/file_util.cc +++ b/base/file_util.cc @@ -381,11 +381,7 @@ std::wstring GetFilenameFromPath(const std::wstring& path) { if (path.empty() || EndsWithSeparator(path)) return std::wstring(); -#if defined(OS_WIN) - return FilePath::FromWStringHack(path).BaseName(); -#elif defined(OS_POSIX) - return UTF8ToWide(FilePath::FromWStringHack(path).BaseName()); -#endif + return FilePath::FromWStringHack(path).BaseName().ToWStringHack(); } bool GetFileSize(const std::wstring& file_path, int64* file_size) { return GetFileSize(FilePath::FromWStringHack(file_path), file_size); |