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

chrome/browser/ui/views/tabs/tab_strip.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_strip.h"
 
 #include <algorithm>
 #include <iterator>
 #include <string>
 #include <vector>
@@ skipping 61 matching lines @@
 #include "ui/gfx/win/hwnd_util.h"
 #include "ui/views/widget/monitor_win.h"
 #include "ui/views/win/hwnd_util.h"
 #endif
 
 using base::UserMetricsAction;
 using ui::DropTargetEvent;
 
 namespace {
 
-const int kNewTabButtonHeight = 18;
-
 const int kTabStripAnimationVSlop = 40;
 
 // Inverse ratio of the width of a tab edge to the width of the tab. When
 // hovering over the left or right edge of a tab, the drop indicator will
 // point between tabs.
 const int kTabEdgeRatioInverse = 4;
 
 // Size of the drop indicator.
 int drop_indicator_width;
 int drop_indicator_height;
@@ skipping 21 matching lines @@
 
 #if defined(OS_MACOSX)
 const int kPinnedToNonPinnedOffset = 2;
 #else
 const int kPinnedToNonPinnedOffset = 3;
 #endif
 
 // The vertical offset of the tab strip button.
 const int kNewTabButtonVerticalOffset = 7;
 
-// Returns the size of the new tab button, not including any bounds extension to
-// enlarge the clickable area.
-gfx::Size GetNewTabButtonSize() {
-  return gfx::Size(GetLayoutConstant(NEW_TAB_BUTTON_WIDTH),
-                   kNewTabButtonHeight);
-}
-
 // Returns the width needed for the new tab button (and padding).
 int GetNewTabButtonWidth() {
-  return GetLayoutConstant(NEW_TAB_BUTTON_WIDTH) -
+  return GetLayoutSize(NEW_TAB_BUTTON).width() -
       GetLayoutConstant(TABSTRIP_NEW_TAB_BUTTON_OVERLAP);
 }
 
 skia::RefPtr<SkDrawLooper> CreateShadowDrawLooper(SkAlpha alpha) {
   SkLayerDrawLooper::Builder looper_builder;
   looper_builder.addLayer();
 
   SkLayerDrawLooper::LayerInfo layer_info;
   layer_info.fPaintBits |= SkLayerDrawLooper::kMaskFilter_Bit;
   layer_info.fPaintBits |= SkLayerDrawLooper::kColorFilter_Bit;
@@ skipping 220 matching lines @@
 
 void NewTabButton::OnGestureEvent(ui::GestureEvent* event) {
   // Consume all gesture events here so that the parent (Tab) does not
   // start consuming gestures.
   views::ImageButton::OnGestureEvent(event);
   event->SetHandled();
 }
 
 void NewTabButton::OnPaint(gfx::Canvas* canvas) {
   gfx::ScopedCanvas scoped_canvas(canvas);
-  canvas->Translate(gfx::Vector2d(0, height() - kNewTabButtonHeight));
+  const int visible_height = GetLayoutSize(NEW_TAB_BUTTON).height();
+  canvas->Translate(gfx::Vector2d(0, height() - visible_height));
 
   const bool pressed = state() == views::CustomButton::STATE_PRESSED;
   double hover_value =
       (state() == views::CustomButton::STATE_HOVERED) ? 1 : 0;
   if (hover_animation_->is_animating())
     hover_value = hover_animation_->GetCurrentValue();
   const float scale = canvas->image_scale();
 
   SkPath fill;
   if (ui::MaterialDesignController::IsModeMaterial()) {
@@ skipping 32 matching lines @@
     paint.setLooper(stroke_looper.get());
     paint.setColor(SkColorSetA(SK_ColorBLACK, pressed ? 0x38 : 0x27));
     canvas->DrawPath(stroke, paint);
   } else {
     // Fill.
     gfx::ImageSkia* mask =
         GetThemeProvider()->GetImageSkiaNamed(IDR_NEWTAB_BUTTON_MASK);
     // The canvas and mask have to use the same scale factor.
     const float fill_canvas_scale = mask->HasRepresentation(scale) ?
         scale : ui::GetScaleForScaleFactor(ui::SCALE_FACTOR_100P);
-    gfx::Canvas fill_canvas(GetNewTabButtonSize(), fill_canvas_scale, false);
+    gfx::Canvas fill_canvas(GetLayoutSize(NEW_TAB_BUTTON), fill_canvas_scale,
+                            false);
     PaintFill(pressed, hover_value, fill_canvas_scale, fill, &fill_canvas);
     gfx::ImageSkia image(fill_canvas.ExtractImageRep());
     canvas->DrawImageInt(
         gfx::ImageSkiaOperations::CreateMaskedImage(image, *mask), 0, 0);
 
     // Stroke.  Draw the button border with a slight alpha.
     static const SkAlpha kGlassFrameOverlayAlpha = 178;
     static const SkAlpha kOpaqueFrameOverlayAlpha = 230;
     const SkAlpha alpha = GetWidget()->ShouldWindowContentsBeTransparent() ?
         kGlassFrameOverlayAlpha : kOpaqueFrameOverlayAlpha;
@@ skipping 106 matching lines @@
     }
 
     // Clip to just the fill region for any theme drawing and hover/pressed
     // state overlay drawing below.  In non-MD mode, this is done on the caller
     // side using image masking operations.
     canvas->ClipPath(fill, true);
     canvas->sk_canvas()->scale(scale, scale);
   }
 
   // Draw the fill background image.
-  const gfx::Size size(GetNewTabButtonSize());
+  const gfx::Size size(GetLayoutSize(NEW_TAB_BUTTON));
   if (custom_image || !md) {
     const ui::ThemeProvider* theme_provider = GetThemeProvider();
     gfx::ImageSkia* background = theme_provider->GetImageSkiaNamed(bg_id);
     // For custom tab backgrounds the background starts at the top of the tab
     // strip. Otherwise the background starts at the top of the frame.
     const int offset_y = theme_provider->HasCustomImage(bg_id) ?
         -GetLayoutConstant(TAB_TOP_EXCLUSION_HEIGHT) : background_offset_.y();
 
     // The new tab background is mirrored in RTL mode, but the theme background
     // should never be mirrored. Mirror it here to compensate.
@@ skipping 1095 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStrip, private:
 
 void TabStrip::Init() {
   set_id(VIEW_ID_TAB_STRIP);
   // So we get enter/exit on children to switch stacked layout on and off.
   set_notify_enter_exit_on_child(true);
 
-  newtab_button_bounds_.set_size(GetNewTabButtonSize());
+  newtab_button_bounds_.set_size(GetLayoutSize(NEW_TAB_BUTTON));
   newtab_button_bounds_.Inset(0, 0, 0, -kNewTabButtonVerticalOffset);
   newtab_button_ = new NewTabButton(this, this);
   newtab_button_->SetTooltipText(
       l10n_util::GetStringUTF16(IDS_TOOLTIP_NEW_TAB));
   newtab_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
   newtab_button_->SetImageAlignment(views::ImageButton::ALIGN_LEFT,
                                     views::ImageButton::ALIGN_BOTTOM);
   newtab_button_->SetEventTargeter(
       scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(newtab_button_)));
@@ skipping 1169 matching lines @@
           ConvertPointToViewAndGetEventHandler(this, newtab_button_, point);
       if (view)
         return view;
     }
     Tab* tab = FindTabForEvent(point);
     if (tab)
       return ConvertPointToViewAndGetEventHandler(this, tab, point);
   }
   return this;
 }