diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-31 17:59:44 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-31 17:59:44 +0000 |
| commit | add9852e7ce11d0faf80c0318ab801b99b325563 (patch) | |
| tree | 10acb42b3232d98c8258e53c616d8de21712f773 /base | |
| parent | f1d8192134f870445ae76be8c16b1566981c9cce (diff) | |
| download | chromium_src-add9852e7ce11d0faf80c0318ab801b99b325563.zip chromium_src-add9852e7ce11d0faf80c0318ab801b99b325563.tar.gz chromium_src-add9852e7ce11d0faf80c0318ab801b99b325563.tar.bz2 | |
Fix Windows build by qualifying the namespace.
TEST=none
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/file_path.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/base/file_path.cc b/base/file_path.cc index dd80eab..8cea54f 100644 --- a/base/file_path.cc +++ b/base/file_path.cc @@ -16,6 +16,7 @@ #include "base/string_piece.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" #if defined(OS_MACOSX) #include "base/scoped_cftyperef.h" @@ -395,7 +396,7 @@ FilePath FilePath::InsertBeforeExtensionASCII(const base::StringPiece& suffix) const { DCHECK(IsStringASCII(suffix)); #if defined(OS_WIN) - return InsertBeforeExtension(ASCIIToWide(suffix)); + return InsertBeforeExtension(ASCIIToUTF16(suffix)); #elif defined(OS_POSIX) return InsertBeforeExtension(suffix.as_string()); #endif @@ -479,7 +480,7 @@ FilePath FilePath::Append(const FilePath& component) const { FilePath FilePath::AppendASCII(const base::StringPiece& component) const { DCHECK(IsStringASCII(component)); #if defined(OS_WIN) - return Append(ASCIIToWide(component)); + return Append(ASCIIToUTF16(component)); #elif defined(OS_POSIX) return Append(component.as_string()); #endif |