Add icon to the panel titlebar on Mac.

chrome/browser/ui/panels/panel_window_controller_cocoa.mm

 // Copyright (c) 2011 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 "chrome/browser/ui/panels/panel_window_controller_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/menu_controller.h"
+#import "chrome/browser/ui/cocoa/tab_contents/favicon_util.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_window_cocoa.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_settings_menu_model.h"
 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 
@@ skipping 138 matching lines @@
 }
 
 - (void)updateTitleBar {
   NSString* newTitle = base::SysUTF16ToNSString(
       windowShim_->browser()->GetWindowTitleForCurrentTab());
   pendingWindowTitle_.reset(
       [BrowserWindowUtils scheduleReplaceOldTitle:pendingWindowTitle_.get()
                                      withNewTitle:newTitle
                                         forWindow:[self window]]);
   [titlebar_view_ setTitle:newTitle];
+
+  NSImage* newIcon = mac::FaviconForTabContents(
+      windowShim_->browser()->GetSelectedTabContentsWrapper());
+  [titlebar_view_ setIcon:newIcon];
+
+  [titlebar_view_ updateIconAndTitleLayout];
 }
 
 - (void)addFindBar:(FindBarCocoaController*)findBarCocoaController {
   NSView* contentView = [[self window] contentView];
   [contentView addSubview:[findBarCocoaController view]];
 
   CGFloat maxY = NSMaxY([contentView frame]);
   CGFloat maxWidth = NSWidth([contentView frame]);
   [findBarCocoaController positionFindBarViewAtMaxY:maxY maxWidth:maxWidth];
 }
@@ skipping 221 matching lines @@
   NSView* titlebar = [self titlebarView];
   return NSHeight([titlebar convertRect:[titlebar bounds] toView:nil]);
 }
 // TestingAPI interface implementation
 
 + (void)enableBoundsAnimationNotifications {
   g_reportAnimationStatus = YES;
 }
 
 @end