Add favicons to Mac bookmark bar.

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;
+
 @interface BookmarkBarController(Private)
 - (void)applyContentAreaOffset:(BOOL)apply;
 - (void)positionBar;
 - (void)showBookmarkBar:(BOOL)enable;
 @end
 
 namespace {
 const int kBookmarkBarHeight = 30;
 // Magic numbers from Cole
 const CGFloat kDefaultBookmarkWidth = 150.0;
@@ skipping 115 matching lines @@
 // TODO(jrg): add an openBookmarkInBackground() for ctrl-click which
 // has a different disposition.
 - (void)openBookmark:(id)sender {
   BookmarkNode* node = static_cast<BookmarkNode*>([[[sender cell]
                                                      representedObject]
                                                     pointerValue]);
   DCHECK(node);
   [delegate_ openBookmarkURL:node->GetURL() disposition:CURRENT_TAB];
 }
 
-// Return an NSCell suitable for a bookmark button.
+// Return an autoreleased NSCell suitable for a bookmark button.
 - (NSCell *)cellForBookmarkNode:(BookmarkNode*)node frame:(NSRect)frame {
   NSString* title = base::SysWideToNSString(node->GetTitle());
   NSButtonCell *cell = [[[BookmarkButtonCell alloc] initTextCell:nil]
                          autorelease];
   DCHECK(cell);
   [cell setRepresentedObject:[NSValue valueWithPointer:node]];
   [cell setButtonType:NSMomentaryPushInButton];
   [cell setBezelStyle:NSShadowlessSquareBezelStyle];
   [cell setShowsBorderOnlyWhileMouseInside:YES];
 
-  // TODO(jrg): add the real image.  Find or write an SkBitmap-to-NSImage helper.
-  // For now I'm using the nav icon just to have something.
-  [cell setImage:[NSImage imageNamed:@"nav"]];
-  [cell setImagePosition:NSImageLeft];
+  // 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);
+    if (image) {
+      [cell setImage:image];
+      [cell setImagePosition:NSImageLeft];
+    }
+  }
 
   [cell setTitle:title];
   [cell setControlSize:NSSmallControlSize];
   [cell setAlignment:NSLeftTextAlignment];
   [cell setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
   [cell setWraps:NO];
   [cell setLineBreakMode:NSLineBreakByTruncatingMiddle];
   [cell setBordered:NO];
   return cell;
 }
@@ skipping 59 matching lines @@
                                     url_string.c_str()];
       [button setToolTip:tooltip];
     }
     // Finally, add it to the bookmark bar.
     [bookmarkBarView_ addSubview:button];
   }
 }
 
 // TODO(jrg): for now this is brute force.
 - (void)loaded:(BookmarkModel*)model {
+  DCHECK(model == bookmarkModel_);
   // Do nothing if not visible or too early
   if ((barIsVisible_ == NO) || !model->IsLoaded())
     return;
   // Else brute force nuke and build.
   BookmarkNode* node = model->GetBookmarkBarNode();
   [self clearBookmarkBar];
   [self addNodesToBar:node];
 }
 
 - (void)beingDeleted:(BookmarkModel*)model {
@@ skipping 12 matching lines @@
            parent:(BookmarkNode*)oldParent index:(int)index {
   [self loaded:model];
 }
 
 // TODO(jrg): for now this is brute force.
 - (void)nodeChanged:(BookmarkModel*)model
                node:(BookmarkNode*)node {
   [self loaded:model];
 }
 
+// TODO(jrg): linear searching is bad.
+// Need a BookmarkNode-->NSCell mapping.
 - (void)nodeFavIconLoaded:(BookmarkModel*)model
                      node:(BookmarkNode*)node {
-  // TODO(jrg): no icons yet
+  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));
+      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