Mac: Improve tab strip layout in case of overflow

chrome/browser/ui/cocoa/tabs/tab_controller.mm

 // Copyright (c) 2012 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/ui/cocoa/tabs/tab_controller.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/i18n/rtl.h"
@@ skipping 53 matching lines @@
   TabController* owner_;  // weak, owns me
 };
 
 }  // TabControllerInternal namespace
 
 // The min widths is the smallest number at which the right edge of the right
 // tab border image is not visibly clipped.  It is a bit smaller than the sum
 // of the two tab edge bitmaps because these bitmaps have a few transparent
 // pixels on the side.  The selected tab width includes the close button width.
 + (CGFloat)minTabWidth { return 36; }
-+ (CGFloat)minSelectedTabWidth { return 52; }
++ (CGFloat)minActiveTabWidth { return 52; }
 + (CGFloat)maxTabWidth { return 214; }
 + (CGFloat)miniTabWidth { return 58; }
 + (CGFloat)appTabWidth { return 66; }
 
 - (TabView*)tabView {
   DCHECK([[self view] isKindOfClass:[TabView class]]);
   return static_cast<TabView*>([self view]);
 }
 
 - (id)init {
@@ skipping 95 matching lines @@
   }
 }
 
 - (void)setTitle:(NSString*)title {
   if ([[self title] isEqualToString:title])
     return;
 
   TabView* tabView = [self tabView];
   [tabView setTitle:title];
 
-  if ([self mini] && ![self selected]) {
+  if ([self mini] && ![self active]) {
     [tabView startAlert];
   }
   [super setTitle:title];
 }
 
 - (void)setToolTip:(NSString*)toolTip {
   [[self view] setToolTip:toolTip];
 }
 
 - (void)setActive:(BOOL)active {
@@ skipping 65 matching lines @@
   const int kPaddingBetweenIcons = 2;
   if (availableWidth >= widthPerIcon &&
       availableWidth < (widthPerIcon + kPaddingBetweenIcons)) {
     return 1;
   }
   return availableWidth / (widthPerIcon + kPaddingBetweenIcons);
 }
 
 - (BOOL)shouldShowIcon {
   return chrome::ShouldTabShowFavicon(
-      [self iconCapacity], [self mini], [self selected], iconView_ != nil,
+      [self iconCapacity], [self mini], [self active], iconView_ != nil,
       !mediaIndicatorView_ ? TAB_MEDIA_STATE_NONE :
           [mediaIndicatorView_ animatingMediaState]);
 }
 
 - (BOOL)shouldShowMediaIndicator {
   if (!mediaIndicatorView_)
     return NO;
   return chrome::ShouldTabShowMediaIndicator(
-      [self iconCapacity], [self mini], [self selected], iconView_ != nil,
+      [self iconCapacity], [self mini], [self active], iconView_ != nil,
       [mediaIndicatorView_ animatingMediaState]);
 }
 
 - (BOOL)shouldShowCloseButton {
   return chrome::ShouldTabShowCloseButton(
-      [self iconCapacity], [self mini], [self selected]);
+      [self iconCapacity], [self mini], [self active]);
 }
 
 - (void)setIconImage:(NSImage*)image {
   [self setIconImage:image withToastAnimation:NO];
 }
 
 - (void)setIconImage:(NSImage*)image withToastAnimation:(BOOL)animate {
   if (image == nil) {
     [self setIconView:nil];
   } else {
@@ skipping 125 matching lines @@
 // TabStripDragController.
 - (BOOL)tabCanBeDragged:(TabController*)controller {
   return [[target_ dragController] tabCanBeDragged:controller];
 }
 
 - (void)maybeStartDrag:(NSEvent*)event forTab:(TabController*)tab {
   [[target_ dragController] maybeStartDrag:event forTab:tab];
 }
 
 @end