P2.1a.

chrome/browser/cocoa/tab_controller.h

Index: chrome/browser/cocoa/tab_controller.h
diff --git a/chrome/browser/cocoa/tab_controller.h b/chrome/browser/cocoa/tab_controller.h
index 06d58c87ce252df496dd229fae8e8848cd2236c8..8b27dd7a31cdf074c7c69ae03f0ea09e3c39b7f6 100644
--- a/chrome/browser/cocoa/tab_controller.h
+++ b/chrome/browser/cocoa/tab_controller.h
@@ -40,6 +40,7 @@ class MenuDelegate;
   IBOutlet NSView* iconView_;
   IBOutlet NSTextField* titleView_;
   IBOutlet HoverCloseButton* closeButton_;
+  NSTimeInterval closeButtonRevealTime_;
 
   NSRect originalIconFrame_;  // frame of iconView_ as loaded from nib
   BOOL isIconShowing_;  // last state of iconView_ in updateVisibility
@@ -47,7 +48,7 @@ class MenuDelegate;
   BOOL pinned_;
   TabLoadingState loadingState_;
   CGFloat iconTitleXOffset_;  // between left edges of icon and title
-  CGFloat titleCloseWidthOffset_;  // between right edges of icon and close btn.
+  CGFloat titleTabOffset_;  // between right edge of title and tab end
   id<TabControllerTarget> target_;  // weak, where actions are sent
   SEL action_;  // selector sent when tab is selected by clicking
   scoped_ptr<TabMenuModel> contextMenuModel_;
@@ -94,13 +95,13 @@ class MenuDelegate;
 
 // Update the title color to match the tabs current state.
 - (void)updateTitleColor;
+
+- (BOOL)closeButtonActive;
 @end
 
 @interface TabController(TestingAPI)
 - (NSString*)toolTip;
 - (int)iconCapacity;
-- (BOOL)shouldShowIcon;
-- (BOOL)shouldShowCloseButton;
 @end  // TabController(TestingAPI)
 
 #endif  // CHROME_BROWSER_COCOA_TAB_CONTROLLER_H_