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/native_library_mac.mm | |
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/native_library_mac.mm')
-rw-r--r-- | base/native_library_mac.mm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/base/native_library_mac.mm b/base/native_library_mac.mm index d13a4b6..95cac15 100644 --- a/base/native_library_mac.mm +++ b/base/native_library_mac.mm @@ -9,7 +9,7 @@ #include "base/file_path.h" #include "base/file_util.h" -#include "base/scoped_cftyperef.h" +#include "base/mac/scoped_cftyperef.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -27,11 +27,12 @@ NativeLibrary LoadNativeLibrary(const FilePath& library_path) { native_lib->dylib = dylib; return native_lib; } - scoped_cftyperef<CFURLRef> url(CFURLCreateFromFileSystemRepresentation( - kCFAllocatorDefault, - (const UInt8*)library_path.value().c_str(), - library_path.value().length(), - true)); + base::mac::ScopedCFTypeRef<CFURLRef> url( + CFURLCreateFromFileSystemRepresentation( + kCFAllocatorDefault, + (const UInt8*)library_path.value().c_str(), + library_path.value().length(), + true)); if (!url) return NULL; CFBundleRef bundle = CFBundleCreate(kCFAllocatorDefault, url.get()); @@ -61,7 +62,7 @@ void UnloadNativeLibrary(NativeLibrary library) { void* GetFunctionPointerFromNativeLibrary(NativeLibrary library, const char* name) { if (library->type == BUNDLE) { - scoped_cftyperef<CFStringRef> symbol_name( + base::mac::ScopedCFTypeRef<CFStringRef> symbol_name( CFStringCreateWithCString(kCFAllocatorDefault, name, kCFStringEncodingUTF8)); return CFBundleGetFunctionPointerForName(library->bundle, symbol_name); |