Add favicons to tabs on the Mac

chrome/browser/cocoa/bookmark_bar_controller.mm

 // Copyright (c) 2009 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.
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #import "chrome/browser/cocoa/bookmark_bar_bridge.h"
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
 #import "chrome/browser/cocoa/bookmark_bar_view.h"
 #import "chrome/browser/cocoa/bookmark_button_cell.h"
-#import "chrome/browser/cocoa/cocoa_utils.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-
-using namespace CocoaUtils;
+#include "skia/ext/skia_utils_mac.h"
 
 @interface BookmarkBarController(Private)
 - (void)applyContentAreaOffset:(BOOL)apply;
 - (void)positionBar;
 - (void)showBookmarkBar:(BOOL)enable;
 @end
 
 namespace {
 const int kBookmarkBarHeight = 30;
 // Magic numbers from Cole
@@ skipping 131 matching lines @@
   DCHECK(cell);
   [cell setRepresentedObject:[NSValue valueWithPointer:node]];
   [cell setButtonType:NSMomentaryPushInButton];
   [cell setBezelStyle:NSShadowlessSquareBezelStyle];
   [cell setShowsBorderOnlyWhileMouseInside:YES];
 
   // The favicon may be NULL if we haven't loaded it yet.  Bookmarks
   // (and their icons) are loaded on the IO thread to speed launch.
   const SkBitmap& favicon = bookmarkModel_->GetFavIcon(node);
   if (!favicon.isNull()) {
-    NSImage* image = SkBitmapToNSImage(favicon);
+    NSImage* image = gfx::SkBitmapToNSImage(favicon);
     if (image) {
       [cell setImage:image];
       [cell setImagePosition:NSImageLeft];
     }
   }
 
   [cell setTitle:title];
   [cell setControlSize:NSSmallControlSize];
   [cell setAlignment:NSLeftTextAlignment];
   [cell setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
@@ skipping 107 matching lines @@
 // TODO(jrg): linear searching is bad.
 // Need a BookmarkNode-->NSCell mapping.
 - (void)nodeFavIconLoaded:(BookmarkModel*)model
                      node:(BookmarkNode*)node {
   NSArray* views = [bookmarkBarView_ subviews];
   for (NSButton* button in views) {
     NSButtonCell* cell = [button cell];
     void* pointer = [[cell representedObject] pointerValue];
     BookmarkNode* cellnode = static_cast<BookmarkNode*>(pointer);
     if (cellnode == node) {
-      NSImage* image = SkBitmapToNSImage(bookmarkModel_->GetFavIcon(node));
+      NSImage* image = gfx::SkBitmapToNSImage(bookmarkModel_->GetFavIcon(node));
       if (image) {
         [cell setImage:image];
         [cell setImagePosition:NSImageLeft];
       }
       return;
     }
   }
 }
 
 // TODO(jrg): for now this is brute force.
 - (void)nodeChildrenReordered:(BookmarkModel*)model
                          node:(BookmarkNode*)node {
   [self loaded:model];
 }
 
 - (NSView*)view {
   return bookmarkBarView_;
 }
 
 @end