Refactor layout constants in preparation for adding support for Material Hybrid.

chrome/browser/ui/views/tabs/tab.cc

 // 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.
 
 #include "chrome/browser/ui/views/tabs/tab.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 633 matching lines @@
   // Assume the entire region to the left of the media indicator and/or close
   // buttons is available for click-to-select.  If neither are visible, the
   // entire tab region is available.
   const int indicator_left = showing_media_indicator_ ?
       media_indicator_button_->x() : width();
   const int close_button_left = showing_close_button_ ?
       close_button_->x() : width();
   return std::min(indicator_left, close_button_left);
 }
 
+// static
 gfx::Size Tab::GetMinimumInactiveSize() {
-  int height;
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    const int kTabHeight = 29;
-    height = kTabHeight;
-  } else {
-    // Since we use images, the real minimum height of the image is
-    // defined most accurately by the height of the end cap images.
-    InitTabResources();
-    height = active_images_.image_l->height();
-  }
-
-  return gfx::Size(GetLayoutInsets(TAB).width(), height);
+  return gfx::Size(GetLayoutInsets(TAB).width(), GetLayoutConstant(TAB_HEIGHT));
 }
 
 // static
 gfx::Size Tab::GetMinimumActiveSize() {
   gfx::Size minimum_size = GetMinimumInactiveSize();
   minimum_size.Enlarge(gfx::kFaviconSize, 0);
   return minimum_size;
 }
 
 // static
 gfx::Size Tab::GetStandardSize() {
-  gfx::Size standard_size = GetMinimumInactiveSize();
-  const int title_spacing = GetLayoutConstant(TAB_FAVICON_TITLE_SPACING);
-  const int title_width = GetLayoutConstant(TAB_MAXIMUM_TITLE_WIDTH);
-  standard_size.Enlarge(title_spacing + title_width, 0);
-  return standard_size;
+  const int kNetTabWidth = 193;
+  return gfx::Size(kNetTabWidth + GetLayoutConstant(TABSTRIP_TAB_OVERLAP),
+                   GetMinimumInactiveSize().height());
 }
 
 // static
 int Tab::GetTouchWidth() {
   return kTouchWidth;
 }
 
 // static
 int Tab::GetPinnedWidth() {
   return GetMinimumInactiveSize().width() +
@@ skipping 1053 matching lines @@
                          const gfx::ImageSkia& image) {
   DCHECK_NE(scale_factor, ui::SCALE_FACTOR_NONE);
   ImageCacheEntry entry;
   entry.resource_id = resource_id;
   entry.scale_factor = scale_factor;
   entry.image = image;
   image_cache_->push_front(entry);
   if (image_cache_->size() > kMaxImageCacheSize)
     image_cache_->pop_back();
 }