Revert "[Material][Mac] Reduced the area above tabs by 2 pts"

chrome/browser/ui/cocoa/browser_window_layout.mm

 // Copyright 2014 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/browser_window_layout.h"
 
 #include <math.h>
 #include <string.h>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
-#include "ui/base/material_design/material_design_controller.h"
 
 namespace chrome {
 
 // The height of the tab strip.
 const CGFloat kTabStripHeight = 37;
-const CGFloat kMaterialTabStripHeight = 35;
-
-CGFloat TabStripHeight() {
-  if (ui::MaterialDesignController::IsModeMaterial())
-    return kMaterialTabStripHeight;
-
-  return kTabStripHeight;
-}
 
 }  // namespace chrome
 
 namespace {
 
 // Insets for the location bar, used when the full toolbar is hidden.
 // TODO(viettrungluu): We can argue about the "correct" insetting; I like the
 // following best, though arguably 0 inset is better/more correct.
 const CGFloat kLocBarLeftRightInset = 1;
 const CGFloat kLocBarTopInset = 0;
@@ skipping 160 matching lines @@
     maxY_ = parameters_.contentViewSize.height + fullscreenYOffset_;
     return;
   }
 
   // Temporary variable to hold the output.
   chrome::TabStripLayout layout = {};
 
   // Lay out the tab strip.
   maxY_ = parameters_.windowSize.height + fullscreenYOffset_;
   CGFloat width = parameters_.contentViewSize.width;
-  layout.frame = NSMakeRect(0, maxY_ - chrome::TabStripHeight(), width,
-                            chrome::TabStripHeight());
+  layout.frame = NSMakeRect(
+      0, maxY_ - chrome::kTabStripHeight, width, chrome::kTabStripHeight);
   maxY_ = NSMinY(layout.frame);
 
   // In Yosemite, there is no longer an exit fullscreen button in the top-right
   // corner of the OSX Menu Bar. Instead, a Cocoa application's toolbar is
   // expected to have traffic lights. Chrome doesn't use an NSToolbar, so it
   // needs to manually add the traffic lights to the tab strip.
   layout.addCustomWindowControls =
       parameters_.inAnyFullscreen && parameters_.isOSYosemiteOrLater;
 
   // Set left indentation based on fullscreen mode status.
   if (!parameters_.inAnyFullscreen || layout.addCustomWindowControls)
     layout.leftIndent = [TabStripController defaultLeftIndentForControls];
 
   // Lay out the icognito/avatar badge because calculating the indentation on
   // the right depends on it.
   if (parameters_.shouldShowAvatar) {
     CGFloat badgeXOffset = -kAvatarRightOffset;
     CGFloat badgeYOffset = 0;
     CGFloat buttonHeight = parameters_.avatarSize.height;
 
     if (parameters_.shouldUseNewAvatar) {
       // The fullscreen icon (if present) is displayed to the right of the
       // new style profile button.
       if (!NSIsEmptyRect(parameters_.fullscreenButtonFrame))
         badgeXOffset = -kLocationBarRightOffset;
 
       // Center the button, but make sure that it's pixel aligned on non-retina
       // displays. Use trunc() instead of round() to mimic the behavior of
       // autoresizesSubviews.
-      badgeYOffset = trunc((chrome::TabStripHeight() - buttonHeight) / 2);
+      badgeYOffset = trunc((chrome::kTabStripHeight - buttonHeight) / 2);
     } else {
       // Actually place the badge *above* |maxY|, by +2 to miss the divider.
       badgeYOffset = 2 * parameters_.avatarLineWidth;
     }
 
     NSSize size = NSMakeSize(parameters_.avatarSize.width,
-                             std::min(buttonHeight, chrome::TabStripHeight()));
+                             std::min(buttonHeight, chrome::kTabStripHeight));
     NSPoint origin =
         NSMakePoint(width - parameters_.avatarSize.width + badgeXOffset,
                     maxY_ + badgeYOffset);
     layout.avatarFrame =
         NSMakeRect(origin.x, origin.y, size.width, size.height);
   }
 
   // Calculate the right indentation.
   // On 10.7 Lion to 10.9 Mavericks, there will be a fullscreen button when not
   // in fullscreen mode.
@@ skipping 123 matching lines @@
   // All the remaining space becomes the frame of the content area.
   output_.contentAreaFrame = NSMakeRect(0, minY, width, maxY - minY);
 }
 
 - (CGFloat)fullscreenBackingBarHeight {
   if (!parameters_.inAnyFullscreen)
     return 0;
 
   CGFloat totalHeight = 0;
   if (parameters_.hasTabStrip)
-    totalHeight += chrome::TabStripHeight();
+    totalHeight += chrome::kTabStripHeight;
 
   if (parameters_.hasToolbar) {
     totalHeight += parameters_.toolbarHeight;
   } else if (parameters_.hasLocationBar) {
     totalHeight +=
         parameters_.toolbarHeight + kLocBarTopInset + kLocBarBottomInset;
   }
 
   if (!parameters_.bookmarkBarHidden &&
       !parameters_.placeBookmarkBarBelowInfoBar)
     totalHeight += parameters_.bookmarkBarHeight;
 
   return totalHeight;
 }
 
 @end
 
 @implementation BrowserWindowLayout (ExposedForTesting)
 
 - (void)setOSYosemiteOrLater:(BOOL)osYosemiteOrLater {
   parameters_.isOSYosemiteOrLater = osYosemiteOrLater;
 }
 
 @end