cocoa browser: remove non-material tabstrip support

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 43 matching lines @@
   }
 
  private:
   id<TabControllerTarget> target_;  // weak
   TabController* owner_;  // weak, owns me
 };
 
 }  // TabControllerInternal namespace
 
 + (CGFloat)defaultTabHeight {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return 26;
-  }
   return 29;
 }
 
 // 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)minActiveTabWidth { return 52; }
 + (CGFloat)maxTabWidth {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return 214;
-  }
   return 246;

[Avi (use Gerrit), 2016/09/22 19:14:05]

Style this to match the two functions above.

[Elly Fong-Jones, 2016/09/23 12:28:16]

Done.

 }
 
 + (CGFloat)pinnedTabWidth { return 58; }
 
 - (TabView*)tabView {
   DCHECK([[self view] isKindOfClass:[TabView class]]);
   return static_cast<TabView*>([self view]);
 }
 
 - (id)init {
   if ((self = [super init])) {
-    bool isModeMaterial = ui::MaterialDesignController::IsModeMaterial();
     // Icon.
     // Remember the icon's frame, so that if the icon is ever removed, a new
     // one can later replace it in the proper location.
     originalIconFrame_ = NSMakeRect(18, 6, 16, 16);
-    if (!isModeMaterial) {
-      originalIconFrame_ = NSMakeRect(19, 5, 16, 16);
-    }
     iconView_.reset([[SpriteView alloc] initWithFrame:originalIconFrame_]);
     [iconView_ setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin];
 
     // When the icon is removed, the title expands to the left to fill the
     // space left by the icon.  When the close button is removed, the title
     // expands to the right to fill its space.  These are the amounts to expand
     // and contract the title frame under those conditions. We don't have to
     // explicilty save the offset between the title and the close button since
     // we can just get that value for the close button's frame.
     NSRect titleFrame = NSMakeRect(35, 6, 92, 17);
 
     // Close button.
     NSRect closeButtonFrame = NSMakeRect(129, 6, 16, 16);
-    if (!isModeMaterial) {
-      closeButtonFrame = NSMakeRect(127, 4, 18, 18);
-    }
     closeButton_.reset([[HoverCloseButton alloc] initWithFrame:
         closeButtonFrame]);
     [closeButton_ setAutoresizingMask:NSViewMinXMargin];
     [closeButton_ setTarget:self];
     [closeButton_ setAction:@selector(closeTab:)];
 
     base::scoped_nsobject<TabView> view([[TabView alloc]
         initWithFrame:NSMakeRect(0, 0, 160, [TabController defaultTabHeight])
            controller:self
           closeButton:closeButton_]);
@@ skipping 283 matching lines @@
 
   // Adjust the title view based on changes to the icon's and close button's
   // visibility.
   NSRect oldTitleFrame = [tabView titleFrame];
   NSRect newTitleFrame;
   newTitleFrame.size.height = oldTitleFrame.size.height;
   newTitleFrame.origin.y = oldTitleFrame.origin.y;
 
   if (newShowIcon) {
     newTitleFrame.origin.x = NSMaxX([iconView_ frame]) + 4;
-
-    if (!ui::MaterialDesignController::IsModeMaterial()) {
-      newTitleFrame.origin.x -= 4;
-    }
   } else {
     newTitleFrame.origin.x = originalIconFrame_.origin.x;
   }
 
   if (newShowAlertIndicator) {
     newTitleFrame.size.width = NSMinX([alertIndicatorButton_ frame]) -
                                newTitleFrame.origin.x;
   } else if (newShowCloseButton) {
     newTitleFrame.size.width = NSMinX([closeButton_ frame]) -
                                newTitleFrame.origin.x;
@@ skipping 27 matching lines @@
         YES : NO;
   }
   return NO;
 }
 
 - (void)maybeStartDrag:(NSEvent*)event forTab:(TabController*)tab {
   [[target_ dragController] maybeStartDrag:event forTab:tab];
 }
 
 @end