cocoa browser: remove non-material tabstrip support

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

Index: chrome/browser/ui/cocoa/tabs/tab_controller.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_controller.mm
index bf5a68287a3980f8e261a4e80907e675ad51127c..c721954503e0ac734a06ecb909983065a4eea8f9 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_controller.mm
@@ -61,9 +61,6 @@ void ExecuteCommand(int command_id, int event_flags) override {
 }  // TabControllerInternal namespace
 
 + (CGFloat)defaultTabHeight {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return 26;
-  }
   return 29;
 }
 
@@ -74,9 +71,6 @@ + (CGFloat)defaultTabHeight {
 + (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.

 }
 
@@ -89,14 +83,10 @@ - (TabView*)tabView {
 
 - (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];
 
@@ -110,9 +100,6 @@ - (id)init {
 
     // 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];
@@ -416,10 +403,6 @@ - (void)updateVisibility {
 
   if (newShowIcon) {
     newTitleFrame.origin.x = NSMaxX([iconView_ frame]) + 4;
-
-    if (!ui::MaterialDesignController::IsModeMaterial()) {
-      newTitleFrame.origin.x -= 4;
-    }
   } else {
     newTitleFrame.origin.x = originalIconFrame_.origin.x;
   }