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 /app/clipboard/clipboard_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 'app/clipboard/clipboard_mac.mm')
| -rw-r--r-- | app/clipboard/clipboard_mac.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/clipboard/clipboard_mac.mm b/app/clipboard/clipboard_mac.mm index 0fa5d8f..c587e3a 100644 --- a/app/clipboard/clipboard_mac.mm +++ b/app/clipboard/clipboard_mac.mm @@ -9,7 +9,7 @@ #include "base/file_path.h" #include "base/logging.h" #include "base/mac_util.h" -#include "base/scoped_cftyperef.h" +#include "base/mac/scoped_cftyperef.h" #include "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" @@ -105,16 +105,16 @@ void Clipboard::WriteBitmap(const char* pixel_data, const char* size_data) { const gfx::Size* size = reinterpret_cast<const gfx::Size*>(size_data); // Safe because the image goes away before the call returns. - scoped_cftyperef<CFDataRef> data( + base::mac::ScopedCFTypeRef<CFDataRef> data( CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(pixel_data), size->width()*size->height()*4, kCFAllocatorNull)); - scoped_cftyperef<CGDataProviderRef> data_provider( + base::mac::ScopedCFTypeRef<CGDataProviderRef> data_provider( CGDataProviderCreateWithCFData(data)); - scoped_cftyperef<CGImageRef> cgimage( + base::mac::ScopedCFTypeRef<CGImageRef> cgimage( CGImageCreate(size->width(), size->height(), 8, |