Move scoped_cftyperef from base to base/mac, use the new namespace, and name ...

chrome/browser/cocoa/tabpose_window.mm

Index: chrome/browser/cocoa/tabpose_window.mm
===================================================================
--- chrome/browser/cocoa/tabpose_window.mm	(revision 62861)
+++ chrome/browser/cocoa/tabpose_window.mm	(working copy)
@@ -45,12 +45,13 @@
 
 @implementation DarkGradientLayer
 - (void)drawInContext:(CGContextRef)context {
-  scoped_cftyperef<CGColorSpaceRef> grayColorSpace(
+  mac/scoped_cftyperef<CGColorSpaceRef> grayColorSpace(
       CGColorSpaceCreateWithName(kCGColorSpaceGenericGray));
   CGFloat grays[] = { 0.277, 1.0, 0.39, 1.0 };
   CGFloat locations[] = { 0, 1 };
-  scoped_cftyperef<CGGradientRef> gradient(CGGradientCreateWithColorComponents(
-      grayColorSpace.get(), grays, locations, arraysize(locations)));
+  base::mac::ScopedCFTypeRef<CGGradientRef> gradient(
+      CGGradientCreateWithColorComponents(
+          grayColorSpace.get(), grays, locations, arraysize(locations)));
   CGPoint topLeft = CGPointMake(0.0, kTopGradientHeight);
   CGContextDrawLinearGradient(context, gradient.get(), topLeft, CGPointZero, 0);
 }
@@ -75,7 +76,7 @@
 
   // If the backing store couldn't be used and a thumbnail was returned from a
   // renderer process, it's stored in |thumbnail_|.
-  scoped_cftyperef<CGImageRef> thumbnail_;
+  base::mac::ScopedCFTypeRef<CGImageRef> thumbnail_;
 
   // True if the layer already sent a thumbnail request to a renderer.
   BOOL didSendLoad_;
@@ -222,7 +223,7 @@
   if (backing_store->cg_layer()) {
     CGContextDrawLayerInRect(context, destRect, backing_store->cg_layer());
   } else {
-    scoped_cftyperef<CGImageRef> image(
+    base::mac::ScopedCFTypeRef<CGImageRef> image(
         CGBitmapContextCreateImage(backing_store->cg_bitmap()));
     CGContextDrawImage(context, destRect, image);
   }
@@ -948,7 +949,7 @@
             IDR_DEFAULT_FAVICON);
     nsFavicon = defaultFavIcon;
   }
-  scoped_cftyperef<CGImageRef> favicon(
+  base::mac::ScopedCFTypeRef<CGImageRef> favicon(
       mac_util::CopyNSImageToCGImage(nsFavicon));
 
   CALayer* faviconLayer = [CALayer layer];
Property changes on: chrome/browser/cocoa/tabpose_window.mm
___________________________________________________________________
Added: svn:eol-style
   + LF