diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 04:09:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 04:09:06 +0000 |
| commit | df0ca6c858762b101bf424ff6c0522409fa195fc (patch) | |
| tree | efa188eee6972e2c0de358f2d19a2348ce6dcb06 /base/file_path.cc | |
| parent | 73de26a684944782a92f8e6840e1b290c9a424cd (diff) | |
| download | chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.zip chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.tar.gz chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.tar.bz2 | |
Move scoped_cftyperef from base to base/mac, use the new namespace, and name it
properly (scoped_cftyperef -> ScopedCFTypeRef).
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3855001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62887 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_path.cc')
| -rw-r--r-- | base/file_path.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/file_path.cc b/base/file_path.cc index e330e3c..5165828 100644 --- a/base/file_path.cc +++ b/base/file_path.cc @@ -21,7 +21,7 @@ #include "base/utf_string_conversions.h" #if defined(OS_MACOSX) -#include "base/scoped_cftyperef.h" +#include "base/mac/scoped_cftyperef.h" #include "base/third_party/icu/icu_utf.h" #endif @@ -991,7 +991,7 @@ int FilePath::HFSFastUnicodeCompare(const StringType& string1, } StringType FilePath::GetHFSDecomposedForm(const StringType& string) { - scoped_cftyperef<CFStringRef> cfstring( + base::mac::ScopedCFTypeRef<CFStringRef> cfstring( CFStringCreateWithBytesNoCopy( NULL, reinterpret_cast<const UInt8*>(string.c_str()), @@ -1038,7 +1038,7 @@ int FilePath::CompareIgnoreCase(const StringType& string1, // GetHFSDecomposedForm() returns an empty string in an error case. if (hfs1.empty() || hfs2.empty()) { NOTREACHED(); - scoped_cftyperef<CFStringRef> cfstring1( + base::mac::ScopedCFTypeRef<CFStringRef> cfstring1( CFStringCreateWithBytesNoCopy( NULL, reinterpret_cast<const UInt8*>(string1.c_str()), @@ -1046,7 +1046,7 @@ int FilePath::CompareIgnoreCase(const StringType& string1, kCFStringEncodingUTF8, false, kCFAllocatorNull)); - scoped_cftyperef<CFStringRef> cfstring2( + base::mac::ScopedCFTypeRef<CFStringRef> cfstring2( CFStringCreateWithBytesNoCopy( NULL, reinterpret_cast<const UInt8*>(string2.c_str()), |