P2.1a.

chrome/browser/cocoa/tab_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_COCOA_TAB_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_TAB_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 #import "chrome/browser/cocoa/hover_close_button.h"
 #include "chrome/browser/tab_menu_model.h"
@@ skipping 22 matching lines @@
 // identifying characteristics such as a favicon, or since it's a full-fledged
 // view, something with state and animation such as a throbber for illustrating
 // progress. The default in the nib is an image view so nothing special is
 // required if that's all you need.
 
 @interface TabController : NSViewController {
  @private
   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
   BOOL selected_;
   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_;
   scoped_ptr<TabControllerInternal::MenuDelegate> contextMenuDelegate_;
   scoped_nsobject<MenuController> contextMenuController_;
 }
 
 @property(assign, nonatomic) TabLoadingState loadingState;
 
 @property(assign, nonatomic) BOOL selected;
@@ skipping 26 matching lines @@
 // Ideally, tabs would know about their own animation and wouldn't need this.
 - (BOOL)inRapidClosureMode;
 
 // Updates the visibility of certain subviews, such as the icon and close
 // button, based on criteria such as the tab's selected state and its current
 // width.
 - (void)updateVisibility;
 
 // 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_