Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: base/native_library_mac.mm

Issue 3855001: Move scoped_cftyperef from base to base/mac, use the new namespace, and name ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/mac_util_unittest.mm ('k') | base/scoped_cftyperef.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/native_library_mac.mm
===================================================================
--- base/native_library_mac.mm (revision 62861)
+++ base/native_library_mac.mm (working copy)
@@ -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 @@
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* 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);
« no previous file with comments | « base/mac_util_unittest.mm ('k') | base/scoped_cftyperef.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698