Make tabs go all the way to the right edge and stop using less of the strip as more tabs are added. Don't resize on selection when tabs are very small, except just enough to show a close box. Clip closebox and favicon as tab gets very small. Fix z-order to be consistent among all unselected tabs. Fix incognito man disappearing when dragging window via the tab. Tabs can now get about as small as they do on windows allowing many more to fit.

BUG=14911, 14913, 17372
TEST=adding and removing lots of tabs and making sure nothing goes wrong.
Review URL: http://codereview.chromium.org/159206

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21432 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 1 deletions

diff --git a/chrome/browser/cocoa/tab_controller.h b/chrome/browser/cocoa/tab_controller.h
index b49da4f..ba1d626 100644
--- a/chrome/browser/cocoa/tab_controller.h
+++ b/chrome/browser/cocoa/tab_controller.h
@@ -37,6 +37,8 @@ enum TabLoadingState {
   IBOutlet NSButton* backgroundButton_;
   IBOutlet NSView* iconView_;
   IBOutlet NSMenu* contextMenu_;
+  IBOutlet NSButton* closeButton_;
+
   BOOL selected_;
   TabLoadingState loadingState_;
   id<TabControllerTarget> target_;  // weak, where actions are sent
@@ -49,9 +51,12 @@ enum TabLoadingState {
 @property(assign, nonatomic) id target;
 @property(assign, nonatomic) SEL action;
 
-// Minimum and maximum allowable tab width.
+// Minimum and maximum allowable tab width. The minimum width does not show
+// the icon or the close box. The selected tab always has at least a close box
+// so it has a different minimum width.
 + (float)minTabWidth;
 + (float)maxTabWidth;
++ (float)minSelectedTabWidth;
 
 // The view associated with this controller, pre-casted as a TabView
 - (TabView *)tabView;
@@ -72,6 +77,9 @@ enum TabLoadingState {
 
 @interface TabController(TestingAPI)
 - (NSString *)toolTip;
+- (int)iconCapacity;
+- (BOOL)shouldShowIcon;
+- (BOOL)shouldShowCloseBox;
 @end  // TabController(TestingAPI)
 
 #endif  // CHROME_BROWSER_COCOA_TAB_CONTROLLER_H_