Compute the correct height above the tabstrip when dragging tabs.

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 101 matching lines @@
 
 // Amount to adjust the clip by when the tab is stacked after the active index.
 const int kStackedTabRightClip = 20;
 
 #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) -
@@ skipping 306 matching lines @@
                          0, alpha);
   }
 }
 
 bool NewTabButton::GetHitTestMask(gfx::Path* mask) const {
   DCHECK(mask);
 
   if (ui::MaterialDesignController::IsModeMaterial()) {
     SkPath border;
     const float scale = GetWidget()->GetCompositor()->device_scale_factor();
-    GetBorderPath(TabStrip::kNewTabButtonVerticalOffset * scale, scale,
+    GetBorderPath(kNewTabButtonVerticalOffset * scale, scale,
                   tab_strip_->SizeTabButtonToTopOfTabStrip(), &border);
     mask->addPath(border, SkMatrix::MakeScale(1 / scale));
   } else if (tab_strip_->SizeTabButtonToTopOfTabStrip()) {
     // When the button is sized to the top of the tab strip, we want the hit
     // test mask to be defined as the complete (rectangular) bounds of the
     // button.
     gfx::Rect button_bounds(GetContentsBounds());
     button_bounds.set_x(GetMirroredXForRect(button_bounds));
     mask->addRect(RectToSkRect(button_bounds));
   } else {
     SkScalar w = SkIntToScalar(width());
-    SkScalar v_offset = SkIntToScalar(TabStrip::kNewTabButtonVerticalOffset);
+    SkScalar v_offset = SkIntToScalar(kNewTabButtonVerticalOffset);
 
     // These values are defined by the shape of the new tab image. Should that
     // image ever change, these values will need to be updated. They're so
     // custom it's not really worth defining constants for.
     // These values are correct for regular and USE_ASH versions of the image.
     mask->moveTo(0, v_offset + 1);
     mask->lineTo(w - 7, v_offset + 1);
     mask->lineTo(w - 4, v_offset + 4);
     mask->lineTo(w, v_offset + 16);
     mask->lineTo(w - 1, v_offset + 17);
@@ skipping 90 matching lines @@
     // The new tab background is mirrored in RTL mode, but the theme background
     // should never be mirrored. Mirror it here to compensate.
     float x_scale = 1.0f;
     int x = GetMirroredX() + background_offset_.x();
     if (base::i18n::IsRTL()) {
       x_scale = -1.0f;
       // Offset by |width| such that the same region is painted as if there was
       // no flip.
       x += size.width();
     }
-    canvas->TileImageInt(*background, x,
-                         TabStrip::kNewTabButtonVerticalOffset + offset_y,
+    canvas->TileImageInt(*background, x, kNewTabButtonVerticalOffset + offset_y,
                          x_scale, 1.0f, 0, 0, size.width(), size.height());
 
     // For non-MD, adjust the alpha of the fill to match that of inactive tabs
     // (except for pressed buttons, which get a different value).  For MD, we do
     // this with an opacity recorder in TabStrip::PaintChildren() so the fill
     // and stroke are both affected, to better match how tabs are handled, but
     // in non-MD, the button stroke is already lighter than the tab stroke, and
     // using the opacity recorder washes it out too much.
     static const SkAlpha kPressedAlpha = 145;
     const SkAlpha alpha =
@@ skipping 65 matching lines @@
 }
 
 void TabStrip::RemoveTabDelegate::AnimationCanceled(
     const gfx::Animation* animation) {
   AnimationEnded(animation);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStrip, public:
 
-// static
-const int TabStrip::kNewTabButtonVerticalOffset = 7;
-
 TabStrip::TabStrip(TabStripController* controller)
     : controller_(controller),
       newtab_button_(NULL),
       current_inactive_width_(Tab::GetStandardSize().width()),
       current_active_width_(Tab::GetStandardSize().width()),
       available_width_for_tabs_(-1),
       in_tab_close_(false),
       animation_container_(new gfx::AnimationContainer()),
       bounds_animator_(this),
       stacked_layout_(false),
@@ skipping 2181 matching lines @@
           ConvertPointToViewAndGetEventHandler(this, newtab_button_, point);
       if (view)
         return view;
     }
     Tab* tab = FindTabForEvent(point);
     if (tab)
       return ConvertPointToViewAndGetEventHandler(this, tab, point);
   }
   return this;
 }