Add favicons to tabs on the Mac

chrome/browser/cocoa/tab_strip_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.
 
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 
 #include "app/l10n_util.h"
+#include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #import "chrome/browser/cocoa/tab_strip_view.h"
 #import "chrome/browser/cocoa/tab_cell.h"
 #import "chrome/browser/cocoa/tab_contents_controller.h"
 #import "chrome/browser/cocoa/tab_controller.h"
 #import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h"
 #import "chrome/browser/cocoa/tab_view.h"
 #import "chrome/browser/cocoa/throbber_view.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "grit/generated_resources.h"
+#include "skia/ext/skia_utils_mac.h"
 
 NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged";
 
 // A simple view class that prevents the windowserver from dragging the
 // area behind tabs. Sometimes core animation confuses it.
 @interface TabStripControllerDragBlockingView : NSView
 @end
 @implementation TabStripControllerDragBlockingView
 - (BOOL)mouseDownCanMoveWindow {return NO;}
 - (void)drawRect:(NSRect)rect {}
@@ skipping 379 matching lines @@
   // Send a broadcast that the number of tabs have changed.
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kTabStripNumberOfTabsChanged
                     object:self];
 
   [self layoutTabs];
 }
 
 // A helper routine for creating an NSImageView to hold the fav icon for
 // |contents|.
-// TODO(pinkerton): fill in with code to use the real favicon, not the default
-// for all cases.
 - (NSImageView*)favIconImageViewForContents:(TabContents*)contents {
   NSRect iconFrame = NSMakeRect(0, 0, 16, 16);
   NSImageView* view = [[[NSImageView alloc] initWithFrame:iconFrame]
                           autorelease];
-  [view setImage:[NSImage imageNamed:@"nav"]];
+
+  NSImage* image = nil;
+
+  NavigationEntry* navEntry = contents->controller().GetLastCommittedEntry();
+  if (navEntry != NULL) {
+    NavigationEntry::FaviconStatus favIcon = navEntry->favicon();
+    const SkBitmap& bitmap = favIcon.bitmap();
+    if (favIcon.is_valid() && !bitmap.isNull())
+      image = gfx::SkBitmapToNSImage(bitmap);
+  }
+
+  // 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 (!image) {
+    NSBundle* bundle = mac_util::MainAppBundle();
+    image = [[NSImage alloc] initByReferencingFile:
+             [bundle pathForResource:@"nav" ofType:@"pdf"]];
+    [image autorelease];
+  }
+
+  [view setImage:image];
   return view;
 }
 
 // Called when a notification is received from the model that the given tab
 // has been updated. |loading| will be YES when we only want to update the
 // throbber state, not anything else about the (partially) loading tab.
 - (void)tabChangedWithContents:(TabContents*)contents
                        atIndex:(NSInteger)index
                    loadingOnly:(BOOL)loading {
   if (!loading)
@@ skipping 120 matching lines @@
     selectedIndex = 0;
   }
   TabContentsController* selectedController =
       [tabContentsArray_ objectAtIndex:selectedIndex];
   if (!selectedController)
     return NSZeroRect;
   return [selectedController growBoxRect];
 }
 
 @end