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

chrome/browser/cocoa/tabpose_window.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/cocoa/tabpose_window.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include "app/resource_bundle.h"
 #include "base/mac_util.h"
@@ skipping 27 matching lines @@
 const CGFloat kSlomoFactor = 4;
 const CGFloat kObserverChangeAnimationDuration = 0.75;  // In seconds.
 
 // CAGradientLayer is 10.6-only -- roll our own.
 @interface DarkGradientLayer : CALayer
 - (void)drawInContext:(CGContextRef)context;
 @end
 
 @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);
 }
 @end
 
 namespace tabpose {
 class ThumbnailLoader;
 }
 
 // A CALayer that draws a thumbnail for a TabContents object. The layer tries
 // to draw the TabContents's backing store directly if possible, and requests
 // a thumbnail bitmap from the TabContents's renderer process if not.
 @interface ThumbnailLayer : CALayer {
   // The TabContents the thumbnail is for.
   TabContents* contents_;  // weak
 
   // The size the thumbnail is drawn at when zoomed in.
   NSSize fullSize_;
 
   // Used to load a thumbnail, if required.
   scoped_refptr<tabpose::ThumbnailLoader> loader_;
 
   // 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_;
 }
 - (id)initWithTabContents:(TabContents*)contents fullSize:(NSSize)fullSize;
 - (void)drawInContext:(CGContextRef)context;
 - (void)setThumbnail:(const SkBitmap&)bitmap;
 @end
 
 namespace tabpose {
@@ skipping 126 matching lines @@
 
 - (void)drawBackingStore:(BackingStoreMac*)backing_store
                   inRect:(CGRect)destRect
                  context:(CGContextRef)context {
   // TODO(thakis): Add a sublayer for each accelerated surface in the rwhv.
   // Until then, accelerated layers (CoreAnimation NPAPI plugins, compositor)
   // won't show up in tabpose.
   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);
   }
 }
 
 - (void)drawInContext:(CGContextRef)context {
   RenderWidgetHost* rwh = contents_->render_view_host();
   // NULL if renderer crashed.
   RenderWidgetHostView* rwhv = rwh ? rwh->view() : NULL;
   if (!rwhv) {
@@ skipping 705 matching lines @@
 
   NSImage* nsFavicon = gfx::SkBitmapToNSImage(tile.favicon());
   // Either we don't have a valid favicon or there was some issue converting
   // it from an SkBitmap. Either way, just show the default.
   if (!nsFavicon) {
     NSImage* defaultFavIcon =
         ResourceBundle::GetSharedInstance().GetNSImageNamed(
             IDR_DEFAULT_FAVICON);
     nsFavicon = defaultFavIcon;
   }
-  scoped_cftyperef<CGImageRef> favicon(
+  base::mac::ScopedCFTypeRef<CGImageRef> favicon(
       mac_util::CopyNSImageToCGImage(nsFavicon));
 
   CALayer* faviconLayer = [CALayer layer];
   faviconLayer.frame = NSRectToCGRect(tile.favicon_rect());
   faviconLayer.contents = (id)favicon.get();
   faviconLayer.zPosition = 1;  // On top of the thumb shadow.
   if (state_ == tabpose::kFadingIn)
     faviconLayer.hidden = YES;
   [bgLayer_ addSublayer:faviconLayer];
   [allFaviconLayers_ addObject:faviconLayer];
@@ skipping 455 matching lines @@
   tile.set_tab_contents(contents);
   ThumbnailLayer* thumbLayer = [allThumbnailLayers_ objectAtIndex:index];
   [thumbLayer setTabContents:contents];
 }
 
 - (void)tabStripModelDeleted {
   [self close];
 }
 
 @end