cocoa browser: remove non-material tabstrip support

chrome/browser/ui/cocoa/tabs/tab_strip_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_strip_controller.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <cmath>
 #include <limits>
@@ skipping 73 matching lines @@
 
 // A value to indicate tab layout should use the full available width of the
 // view.
 const CGFloat kUseFullAvailableWidth = -1.0;
 
 // The amount by which pinned tabs are separated from normal tabs.
 const CGFloat kLastPinnedTabSpacing = 2.0;
 
 // The amount by which the new tab button is offset (from the tabs).
 const CGFloat kNewTabButtonOffset = 10.0;
-const CGFloat kNewTabButtonOffsetNonMD = 8.0;
 
 // Time (in seconds) in which tabs animate to their final position.
 const NSTimeInterval kAnimationDuration = 0.125;
 
 // Helper class for doing NSAnimationContext calls that takes a bool to disable
 // all the work.  Useful for code that wants to conditionally animate.
 class ScopedNSAnimationContextGroup {
  public:
   explicit ScopedNSAnimationContextGroup(bool animate)
       : animate_(animate) {
@@ skipping 458 matching lines @@
   // window controls.
   return 70.0;
 }
 
 + (CGFloat)tabOverlap {
   // The overlap value needs to be <= the x position of the favicon within a
   // tab. Else, every time the throbber is painted, the throbber's invalidation
   // will also invalidate parts of the tab to the left, and two tabs's
   // backgrounds need to be painted on each throbber frame instead of one.
   const CGFloat kTabOverlap = 18.0;
-  const CGFloat kTabOverlapNonMD = 19.0;
-
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return kTabOverlapNonMD;
-  }
   return kTabOverlap;
 }
 
 // Finds the TabContentsController associated with the given index into the tab
 // model and swaps out the sole child of the contentArea to display its
 // contents.
 - (void)swapInTabAtIndex:(NSInteger)modelIndex {
   DCHECK(modelIndex >= 0 && modelIndex < tabStripModel_->count());
   NSInteger index = [self indexFromModelIndex:modelIndex];
   TabContentsController* controller = [tabContentsArray_ objectAtIndex:index];
@@ skipping 336 matching lines @@
   // pinned tabs have a fixed width. We may not be able to use the entire width
   // if the user is quickly closing tabs. This may be negative, but that's okay
   // (taken care of by |MAX()| when calculating tab sizes).
   CGFloat availableSpace = 0;
   if ([self inRapidClosureMode]) {
     availableSpace = availableResizeWidth_;
   } else {
     availableSpace = NSWidth([tabStripView_ frame]);
 
     // Account for the width of the new tab button.
-    if (!ui::MaterialDesignController::IsModeMaterial()) {
-      availableSpace -=
-          NSWidth([newTabButton_ frame]) + kNewTabButtonOffsetNonMD -
-              kTabOverlap;
-    } else {
-      availableSpace -=
-          NSWidth([newTabButton_ frame]) + kNewTabButtonOffset - kTabOverlap;
-    }
+    availableSpace -=
+        NSWidth([newTabButton_ frame]) + kNewTabButtonOffset - kTabOverlap;
     // Account for the right-side controls if not in rapid closure mode.
     // (In rapid closure mode, the available width is set based on the
     // position of the rightmost tab, not based on the width of the tab strip,
     // so the right controls have already been accounted for.)
     availableSpace -= [self rightIndentForControls];
   }
 
   // Need to leave room for the left-side controls even in rapid closure mode.
   availableSpace -= [self leftIndentForControls];
 
@@ skipping 607 matching lines @@
       tabStripModel_->IsTabPinned(modelIndex);  // Always show icon if pinned.
 
   TabLoadingState oldState = [tabController loadingState];
   TabLoadingState newState = kTabDone;
   NSImage* throbberImage = nil;
   if (contents->IsCrashed()) {
     newState = kTabCrashed;
     newHasIcon = true;
   } else if (contents->IsWaitingForResponse()) {
     newState = kTabWaiting;
-    if (ui::MaterialDesignController::IsModeMaterial() &&
-        [[[tabController view] window] hasDarkTheme]) {
+    if ([[[tabController view] window] hasDarkTheme]) {
       throbberImage = throbberWaitingIncognitoImage;
     } else {
       throbberImage = throbberWaitingImage;
     }
   } else if (contents->IsLoadingToDifferentDocument()) {
     newState = kTabLoading;
-    if (ui::MaterialDesignController::IsModeMaterial() &&
-        [[[tabController view] window] hasDarkTheme]) {
+    if ([[[tabController view] window] hasDarkTheme]) {
       throbberImage = throbberLoadingIncognitoImage;
     } else {
       throbberImage = throbberLoadingImage;
     }
   }
 
   if (oldState != newState)
     [tabController setLoadingState:newState];
 
   // While loading, this function is called repeatedly with the same state.
@@ skipping 748 matching lines @@
   for (int i = 0; i < tabStripModel_->count(); i++) {
     [self updateIconsForContents:tabStripModel_->GetWebContentsAt(i) atIndex:i];
   }
 }
 
 - (void)setVisualEffectsDisabledForFullscreen:(BOOL)fullscreen {
   [tabStripView_ setVisualEffectsDisabledForFullscreen:fullscreen];
 }
 
 @end