Several background pattern fixes on the Mac....

chrome/browser/cocoa/tab_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/mac_util.h"
 #import "chrome/browser/cocoa/tab_controller.h"
 #import "chrome/browser/cocoa/tab_controller_target.h"
 #import "chrome/browser/cocoa/tab_view.h"
 #import "third_party/GTM/AppKit/GTMTheme.h"
 
@@ skipping 15 matching lines @@
 + (float)maxTabWidth { return 220; }
 
 - (TabView*)tabView {
   return static_cast<TabView*>([self view]);
 }
 
 - (id)init {
   self = [super initWithNibName:@"TabView" bundle:mac_util::MainAppBundle()];
   if (self != nil) {
     isIconShowing_ = YES;
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
-           selector:@selector(viewResized:)
-               name:NSViewFrameDidChangeNotification
-             object:[self view]];
+    NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
+    [defaultCenter addObserver:self
+                      selector:@selector(viewResized:)
+                          name:NSViewFrameDidChangeNotification
+                        object:[self view]];
+    [defaultCenter addObserver:self
+                      selector:@selector(themeChangedNotification:)
+                          name:kGTMThemeDidChangeNotification
+                        object:nil];
   }
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
 // The internals of |-setSelected:| but doesn't check if we're already set
 // to |selected|. Pass the selection change to the subviews that need it and
 // mark ourselves as needing a redraw.
 - (void)internalSetSelected:(BOOL)selected {
   selected_ = selected;
-  [(TabView *)[self view] setState:selected];
+  TabView* tabView = static_cast<TabView*>([self view]);
+  [tabView setState:selected];
   [self updateVisibility];
-  [self applyTheme];
+  [self updateTitleColor];
 }
 
 // Called when the tab's nib is done loading and all outlets are hooked up.
 - (void)awakeFromNib {
   // Remember the icon's frame, so that if the icon is ever removed, a new
   // one can later replace it in the proper location.
   originalIconFrame_ = [iconView_ frame];
 
   // When the icon is removed, the title expands to the left to fill the space
   // left by the icon.  When the close button is removed, the title expands to
   // the right to fill its space.  These are the amounts to expand and contract
   // titleView_ under those conditions.
   NSRect titleFrame = [titleView_ frame];
   iconTitleXOffset_ = NSMinX(titleFrame) - NSMinX(originalIconFrame_);
   titleCloseWidthOffset_ = NSMaxX([closeButton_ frame]) - NSMaxX(titleFrame);
 
-  // Ensure we don't show favicon if the tab is already too small to begin with.
-  [self updateVisibility];
-
   [self internalSetSelected:selected_];
 }
 
 - (IBAction)closeTab:(id)sender {
   if ([[self target] respondsToSelector:@selector(closeTab:)]) {
     [[self target] performSelector:@selector(closeTab:)
                         withObject:[self view]];
   }
 }
 
 // Dispatches the command in the tag to the registered target object.
 - (IBAction)commandDispatch:(id)sender {
   TabStripModel::ContextMenuCommand command =
       static_cast<TabStripModel::ContextMenuCommand>([sender tag]);
   [[self target] commandDispatch:command forController:self];
 }
 
 // Called for each menu item on its target, which would be this controller.
 // Returns YES if the menu item should be enabled. We ask the tab's
 // target for the proper answer.
 - (BOOL)validateMenuItem:(NSMenuItem*)item {
   TabStripModel::ContextMenuCommand command =
       static_cast<TabStripModel::ContextMenuCommand>([item tag]);
   return [[self target] isCommandEnabled:command forController:self];
 }
 
-- (void)setTitle:(NSString *)title {
+- (void)setTitle:(NSString*)title {
   [[self view] setToolTip:title];
   [super setTitle:title];
 }
 
 - (void)setSelected:(BOOL)selected {
   if (selected_ != selected)
     [self internalSetSelected:selected];
 }
 
 - (BOOL)selected {
@@ skipping 10 matching lines @@
   [self updateVisibility];
 
   if (iconView_)
     [[self view] addSubview:iconView_];
 }
 
 - (NSView*)iconView {
   return iconView_;
 }
 
-- (NSString *)toolTip {
+- (NSString*)toolTip {
   return [[self view] toolTip];
 }
 
 // Return a rough approximation of the number of icons we could fit in the
 // tab. We never actually do this, but it's a helpful guide for determining
 // how much space we have available.
 - (int)iconCapacity {
   float width = NSMaxX([closeButton_ frame]) - NSMinX(originalIconFrame_);
   float iconWidth = NSWidth(originalIconFrame_);
 
@@ skipping 60 matching lines @@
     // absence of the close button.
     if (newShowCloseButton)
       titleFrame.size.width -= titleCloseWidthOffset_;
     else
       titleFrame.size.width += titleCloseWidthOffset_;
   }
 
   [titleView_ setFrame:titleFrame];
 }
 
+- (void)updateTitleColor {
+  NSColor* titleColor = nil;
+  GTMTheme* theme = [[self view] gtm_theme];
+  if (![self selected]) {
+    titleColor = [theme textColorForStyle:GTMThemeStyleTabBarDeselected
+                                    state:GTMThemeStateActiveWindow];
+  }
+  // Default to the selected text color unless told otherwise.
+  if (!titleColor) {
+    titleColor = [theme textColorForStyle:GTMThemeStyleTabBarSelected
+                                    state:GTMThemeStateActiveWindow];
+  }
+  [titleView_ setTextColor:titleColor ? titleColor : [NSColor textColor]];
+}
+
 // Called when our view is resized. If it gets too small, start by hiding
 // the close button and only show it if tab is selected. Eventually, hide the
 // icon as well. We know that this is for our view because we only registered
 // for notifications from our specific view.
 - (void)viewResized:(NSNotification*)info {
   [self updateVisibility];
 }
 
-- (void)applyTheme {
-  GTMTheme* theme = [[self view] gtm_theme];
-  NSColor* color = nil;
-  if (!selected_) {
-    color = [theme textColorForStyle:GTMThemeStyleTabBarDeselected
-                               state:GTMThemeStateActiveWindow];
+- (void)themeChangedNotification:(NSNotification*)notification {
+  GTMTheme* theme = [notification object];
+  NSView* view = [self view];
+  if ([theme isEqual:[view gtm_theme]]) {
+    [self updateTitleColor];
   }
-  // Default to the selected text color unless told otherwise.
-  if (!color) {
-    color = [theme textColorForStyle:GTMThemeStyleToolBar
-                               state:GTMThemeStateActiveWindow];
-  }
-
-  [titleView_ setTextColor:color ? color : [NSColor textColor]];
-  [[self view] setNeedsDisplay:YES];
 }
 
 // Called by the tabs to determine whether we are in rapid (tab) closure mode.
 - (BOOL)inRapidClosureMode {
   if ([[self target] respondsToSelector:@selector(inRapidClosureMode)]) {
     return [[self target] performSelector:@selector(inRapidClosureMode)] ?
         YES : NO;
   }
   return NO;
 }
 
 @end