Mac: Improve tab strip layout in case of overflow

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

 // Copyright (c) 2011 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 <Cocoa/Cocoa.h>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/tabs/media_indicator_view.h"
@@ skipping 350 matching lines @@
   EXPECT_FALSE([controller shouldShowCloseButton]);
 
   // Setting the icon when tab is at min width should not show icon (bug 18359).
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   base::scoped_nsobject<NSImage> image(
       rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).CopyNSImage());
   [controller setIconImage:image];
   NSView* newIcon = [controller iconView];
   EXPECT_TRUE([newIcon isHidden]);
 
-  // Tab is at selected minimum width. Since it's selected, the close box
+  // Tab is at active minimum width. Since it's active, the close box
   // should be visible.
-  [controller setSelected:YES];
+  [controller setActive:YES];
   frame = [[controller view] frame];
-  frame.size.width = [TabController minSelectedTabWidth];
+  frame.size.width = [TabController minActiveTabWidth];
   [[controller view] setFrame:frame];
   EXPECT_FALSE([controller shouldShowIcon]);
   EXPECT_TRUE([newIcon isHidden]);
   EXPECT_TRUE([controller shouldShowCloseButton]);
 
   // Test expanding the tab to max width and ensure the icon and close box
-  // get put back, even when de-selected.
+  // get put back, even when de-activated.
   frame.size.width = [TabController maxTabWidth];
   [[controller view] setFrame:frame];
   EXPECT_TRUE([controller shouldShowIcon]);
   EXPECT_FALSE([newIcon isHidden]);
   EXPECT_TRUE([controller shouldShowCloseButton]);
-  [controller setSelected:NO];
+  [controller setActive:NO];
   EXPECT_TRUE([controller shouldShowIcon]);
   EXPECT_TRUE([controller shouldShowCloseButton]);
 
   cap = [controller iconCapacity];
   EXPECT_GT(cap, 0);
 }
 
 TEST_F(TabControllerTest, Menu) {
   NSWindow* window = test_window();
   base::scoped_nsobject<TabController> controller([[TabController alloc] init]);
@@ skipping 118 matching lines @@
         [[controller mediaIndicatorView] updateIndicator:mediaState];
         [controller setIconImage:favicon];
 
         // Test layout for every width from maximum to minimum.
         NSRect tabFrame = [[controller view] frame];
         int minWidth;
         if (isMiniTab) {
           tabFrame.size.width = minWidth = [TabController miniTabWidth];
         } else {
           tabFrame.size.width = [TabController maxTabWidth];
-          minWidth = isActiveTab ? [TabController minSelectedTabWidth] :
+          minWidth = isActiveTab ? [TabController minActiveTabWidth] :
               [TabController minTabWidth];
         }
         while (NSWidth(tabFrame) >= minWidth) {
           SCOPED_TRACE(::testing::Message() << "width=" << tabFrame.size.width);
           [[controller view] setFrame:tabFrame];
           CheckForExpectedLayoutAndVisibilityOfSubviews(controller);
           --tabFrame.size.width;
         }
       }
     }
   }
 }
 
 }  // namespace