P2.1a.

chrome/browser/cocoa/tab_view.mm

 // Copyright (c) 2010 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_view.h"
 
 #include "base/logging.h"
 #include "base/nsimage_cache_mac.h"
 #include "chrome/browser/browser_theme_provider.h"
 #import "chrome/browser/cocoa/tab_controller.h"
@@ skipping 74 matching lines @@
 // hierarchy) first. We want to handle clicks and drags in this class and
 // leave the background button for display purposes only.
 - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
   return YES;
 }
 
 - (void)mouseEntered:(NSEvent*)theEvent {
   isMouseInside_ = YES;
   [self resetLastGlowUpdateTime];
   [self adjustGlowValue];
+
+  // The controller needs to update favicon/close button display state.
+  [controller_ updateVisibility];
 }
 
 - (void)mouseMoved:(NSEvent*)theEvent {
   hoverPoint_ = [self convertPoint:[theEvent locationInWindow]
                           fromView:nil];
   [self setNeedsDisplay:YES];
 }
 
 - (void)mouseExited:(NSEvent*)theEvent {
   isMouseInside_ = NO;
   hoverHoldEndTime_ =
       [NSDate timeIntervalSinceReferenceDate] + kHoverHoldDuration;
   [self resetLastGlowUpdateTime];
   [self adjustGlowValue];
+
+  // The controller needs to update favicon/close button display state.
+  [controller_ updateVisibility];
 }
 
 - (void)setTrackingEnabled:(BOOL)enabled {
   [closeButton_ setTrackingEnabled:enabled];
 }
 
 // Determines which view a click in our frame actually hit. It's either this
 // view or our child close button.
 - (NSView*)hitTest:(NSPoint)aPoint {
   NSPoint viewPoint = [self convertPoint:aPoint fromView:[self superview]];
@@ skipping 83 matching lines @@
 // Handle clicks and drags in this button. We get here because we have
 // overridden acceptsFirstMouse: and the click is within our bounds.
 - (void)mouseDown:(NSEvent*)theEvent {
   if ([self isClosing])
     return;
 
   NSPoint downLocation = [theEvent locationInWindow];
 
   // Record the state of the close button here, because selecting the tab will
   // unhide it.
-  BOOL closeButtonActive = [closeButton_ isHidden] ? NO : YES;
+  BOOL closeButtonActive = [controller_ closeButtonActive];
 
   // During the tab closure animation (in particular, during rapid tab closure),
   // we may get incorrectly hit with a mouse down. If it should have gone to the
   // close button, we send it there -- it should then track the mouse, so we
   // don't have to worry about mouse ups.
   if (closeButtonActive && [controller_ inRapidClosureMode]) {
     NSPoint hitLocation = [[self superview] convertPoint:downLocation
                                                 fromView:nil];
     if ([self hitTest:hitLocation] == closeButton_) {
       [closeButton_ mouseDown:theEvent];
@@ skipping 574 matching lines @@
 - (void)cancelAlert {
   if (alertState_ != tabs::kAlertNone) {
     alertState_ = tabs::kAlertFalling;
     alertHoldEndTime_ =
         [NSDate timeIntervalSinceReferenceDate] + kGlowUpdateInterval;
     [self resetLastGlowUpdateTime];
     [self adjustGlowValue];
   }
 }
 
+- (BOOL)isMouseInside {
+  return isMouseInside_;
+}
+
 - (BOOL)accessibilityIsIgnored {
   return NO;
 }
 
 - (NSArray*)accessibilityActionNames {
   NSArray* parentActions = [super accessibilityActionNames];
 
   return [parentActions arrayByAddingObject:NSAccessibilityPressAction];
 }
 
@@ skipping 127 matching lines @@
   }
 
   if (nextUpdate < kNoUpdate)
     [self performSelector:_cmd withObject:nil afterDelay:nextUpdate];
 
   [self resetLastGlowUpdateTime];
   [self setNeedsDisplay:YES];
 }
 
 @end  // @implementation TabView(Private)