Ash: Update tab strip for new image assets

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 <vector>
 
@@ skipping 33 matching lines @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/hwnd_util.h"
 #include "ui/views/widget/monitor_win.h"
 #endif
 
 using views::DropTargetEvent;
 
+// Offset for the new tab button to bring it closer to the rightmost tab.
+#if defined(USE_ASH)
+static const int kNewTabButtonHOffset = -11;
+static const int kNewTabButtonVOffset = 7;
+#else
 static const int kNewTabButtonHOffset = -5;
 static const int kNewTabButtonVOffset = 5;
-static const int kSuspendAnimationsTimeMs = 200;
+#endif
+// Amount the left edge of a tab is offset from the rectangle of the tab's
+// favicon/title/close box.  Related to the width of IDR_TAB_ACTIVE_LEFT.
+#if defined(USE_ASH)
+static const int kTabHOffset = -28;
+#else
 static const int kTabHOffset = -16;
+#endif
 static const int kTabStripAnimationVSlop = 40;
 // Inactive tabs in a native frame are slightly transparent.
 static const int kNativeFrameInactiveTabAlpha = 200;
 // If there are multiple tabs selected then make non-selected inactive tabs
 // even more transparent.
 static const int kNativeFrameInactiveTabAlphaMultiSelection = 150;
 
 // 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.
@@ skipping 94 matching lines @@
 }
 
 void NewTabButton::GetHitTestMask(gfx::Path* path) const {
   DCHECK(path);
 
   SkScalar w = SkIntToScalar(width());
 
   // These values are defined by the shape of the new tab bitmap. Should that
   // bitmap 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 bitmap.
   path->moveTo(0, 1);
   path->lineTo(w - 7, 1);
   path->lineTo(w - 4, 4);
   path->lineTo(w, 16);
   path->lineTo(w - 1, 17);
   path->lineTo(7, 17);
   path->lineTo(4, 13);
   path->lineTo(0, 1);
   path->close();
 }
@@ skipping 1728 matching lines @@
 ui::AnimationDelegate* TabStrip::CreateRemoveTabDelegate(BaseTab* tab) {
   return new RemoveTabDelegate(this, tab);
 }
 
 bool TabStrip::IsPointInTab(Tab* tab,
                             const gfx::Point& point_in_tabstrip_coords) {
   gfx::Point point_in_tab_coords(point_in_tabstrip_coords);
   View::ConvertPointToView(this, tab, &point_in_tab_coords);
   return tab->HitTest(point_in_tab_coords);
 }