Add icon to the panel titlebar on Mac.

chrome/browser/ui/panels/panel_titlebar_view_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.
 
 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"
 
 #include <Carbon/Carbon.h>  // kVK_Escape
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/hover_image_button.h"
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/tracking_area.h"
 #import "chrome/browser/ui/panels/panel_window_controller_cocoa.h"
 #include "grit/theme_resources_standard.h"
 #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h"
 #include "ui/gfx/mac/nsimage_cache.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 const int kRoundedCornerSize = 3;
-const int kCloseButtonLeftPadding = 8;
+const int kButtonPadding = 8;
+const int kIconAndTextPadding = 5;
 
 // Used to implement TestingAPI
 static NSEvent* MakeMouseEvent(NSEventType type, NSPoint point) {
   return [NSEvent mouseEventWithType:type
                             location:point
                        modifierFlags:0
                            timestamp:0
                         windowNumber:0
                              context:nil
                          eventNumber:0
@@ skipping 140 matching lines @@
   [settingsButton_ setDefaultOpacity:0.6];
   [settingsButton_ setHoverImage:image];
   [settingsButton_ setHoverOpacity:0.9];
   [settingsButton_ setPressedImage:image];
   [settingsButton_ setPressedOpacity:1.0];
   [[settingsButton_ cell] setHighlightsBy:NSNoCellMask];
   [self checkMouseAndUpdateSettingsButtonVisibility];
 
   // Update layout of controls in the titlebar.
   [self updateCloseButtonLayout];
+  [self updateIconAndTitleLayout];
 
   // Set autoresizing behavior: glued to edges on left, top and right.
   [self setAutoresizingMask:(NSViewMinYMargin | NSViewWidthSizable)];
 
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(didChangeTheme:)
              name:kBrowserThemeDidChangeNotification
            object:nil];
   // Register for various window focus changes, so we can update our custom
   // titlebar appropriately.
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(didChangeMainWindow:)
              name:NSWindowDidBecomeMainNotification
            object:[self window]];
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(didChangeMainWindow:)
              name:NSWindowDidResignMainNotification
            object:[self window]];
 }
 
 - (void)setTitle:(NSString*)newTitle {
   [title_ setStringValue:newTitle];
 }
 
+- (void)setIcon:(NSImage*)newIcon {
+  [icon_ setImage:newIcon];
+}
+
 - (void)updateCloseButtonLayout {
-  NSRect buttonBounds = [closeButton_ bounds];
+  NSRect buttonFrame = [closeButton_ frame];
   NSRect bounds = [self bounds];
 
-  int x = kCloseButtonLeftPadding;
-  int y = (NSHeight(bounds) - NSHeight(buttonBounds)) / 2;
-  NSRect buttonFrame = NSMakeRect(x,
-                                  y,
-                                  NSWidth(buttonBounds),
-                                  NSHeight(buttonBounds));
+  buttonFrame.origin.x = kButtonPadding;
+  buttonFrame.origin.y = (NSHeight(bounds) - NSHeight(buttonFrame)) / 2;
   [closeButton_ setFrame:buttonFrame];
 
   DCHECK(!closeButtonTrackingArea_.get());
   closeButtonTrackingArea_.reset(
       [[CrTrackingArea alloc] initWithRect:buttonFrame
                                    options:(NSTrackingMouseEnteredAndExited |
                                             NSTrackingActiveAlways)
                               proxiedOwner:self
                                   userInfo:nil]);
   NSWindow* panelWindow = [self window];
   [closeButtonTrackingArea_.get() clearOwnerWhenWindowWillClose:panelWindow];
   [self addTrackingArea:closeButtonTrackingArea_.get()];
 }
 
+- (void)updateIconAndTitleLayout {
+  NSRect closeButtonFrame = [closeButton_ frame];
+  NSRect iconFrame = [icon_ frame];
+  [title_ sizeToFit];
+  NSRect titleFrame = [title_ frame];
+  NSRect settingsButtonFrame = [settingsButton_ frame];
+  NSRect bounds = [self bounds];
+
+  // Place the icon and title at the center of the titlebar.
+  int iconWidthWithPadding = NSWidth(iconFrame) + kIconAndTextPadding;
+  int titleWidth = NSWidth(titleFrame);
+  int availableWidth = NSWidth(bounds) - kButtonPadding * 4 -
+      NSWidth(closeButtonFrame) - NSWidth(settingsButtonFrame);
+  if (iconWidthWithPadding + titleWidth > availableWidth)
+    titleWidth = availableWidth - iconWidthWithPadding;
+  int startX = kButtonPadding * 2 + NSWidth(closeButtonFrame) +
+      (availableWidth - iconWidthWithPadding - titleWidth) / 2;
+
+  iconFrame.origin.x = startX;
+  iconFrame.origin.y = (NSHeight(bounds) - NSHeight(iconFrame)) / 2;
+  [icon_ setFrame:iconFrame];
+
+  titleFrame.origin.x = startX + iconWidthWithPadding;
+  titleFrame.origin.y = (NSHeight(bounds) - NSHeight(titleFrame)) / 2;
+  titleFrame.size.width = titleWidth;
+  [title_ setFrame:titleFrame];
+}
+
 // PanelManager controls size/position of the window.
 - (BOOL)mouseDownCanMoveWindow {
   return NO;
 }
 
 - (BOOL)acceptsFirstMouse:(NSEvent*)event {
   return YES;
 }
 
 - (void)mouseEntered:(NSEvent*)event {
@@ skipping 133 matching lines @@
 }
 
 - (void)checkMouseAndUpdateSettingsButtonVisibility {
   BOOL mouseOverWindow = NSPointInRect([NSEvent mouseLocation],
                                        [[controller_ window] frame]);
   [self updateSettingsButtonVisibility:mouseOverWindow];
 }
 
 @end