P2.1a.

chrome/browser/cocoa/tab_view.mm

Index: chrome/browser/cocoa/tab_view.mm
diff --git a/chrome/browser/cocoa/tab_view.mm b/chrome/browser/cocoa/tab_view.mm
index cc2df734f00ff49bfbc5b2a17aafda6ac48b7f47..029810de3c70fcd33bb3a1d5f6d94f7a3fc53f66 100644
--- a/chrome/browser/cocoa/tab_view.mm
+++ b/chrome/browser/cocoa/tab_view.mm
@@ -92,6 +92,9 @@ const CGFloat kRapidCloseDist = 2.5;
   isMouseInside_ = YES;
   [self resetLastGlowUpdateTime];
   [self adjustGlowValue];
+
+  // The controller needs to update favicon/close button display state.
+  [controller_ updateVisibility];
 }
 
 - (void)mouseMoved:(NSEvent*)theEvent {
@@ -106,6 +109,9 @@ const CGFloat kRapidCloseDist = 2.5;
       [NSDate timeIntervalSinceReferenceDate] + kHoverHoldDuration;
   [self resetLastGlowUpdateTime];
   [self adjustGlowValue];
+
+  // The controller needs to update favicon/close button display state.
+  [controller_ updateVisibility];
 }
 
 - (void)setTrackingEnabled:(BOOL)enabled {
@@ -209,7 +215,7 @@ const CGFloat kRapidCloseDist = 2.5;
 
   // 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
@@ -804,6 +810,10 @@ const CGFloat kRapidCloseDist = 2.5;
   }
 }
 
+- (BOOL)isMouseInside {
+  return isMouseInside_;
+}
+
 - (BOOL)accessibilityIsIgnored {
   return NO;
 }