Ash: Update tab strip for new image assets

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/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
@@ skipping 12 matching lines @@
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/touchui/touch_mode_support.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
+// Padding around the "content" of a tab, occupied by the tab border graphics.
+#if defined(USE_ASH)
+static const int kLeftPadding = 21;
+static const int kTopPadding = 8;
+static const int kRightPadding = 20;
+static const int kBottomPadding = 5;
+#else
 static const int kLeftPadding = 16;
 static const int kTopPadding = 6;
 static const int kRightPadding = 15;
 static const int kBottomPadding = 5;
+#endif
+
+// Height of the shadow at the top of the tab image assets.
+#if defined(USE_ASH)
+static const int kDropShadowHeight = 4;
+#else
 static const int kDropShadowHeight = 2;
+#endif
 static const int kToolbarOverlap = 1;
 static const int kFaviconTitleSpacing = 4;
+// Additional vertical offset for title text relative to top of tab.
+#if defined(USE_ASH)
+static const int kTitleTextOffsetY = 2;
+#else
+static const int kTitleTextOffsetY = 0;
+#endif
 static const int kTitleCloseButtonSpacing = 3;
 static const int kStandardTitleWidth = 175;
+// Additional vertical offset for close button relative to top of tab.
+#if defined(USE_ASH)
+static const int kCloseButtonVertFuzz = 1;
+#else
 static const int kCloseButtonVertFuzz = 0;
+#endif
 static const int kTabIconSize = gfx::kFaviconSize;
 static const int kCloseButtonHorzFuzz = 5;
 static const int kTouchModeMinimumWidth = 160;
 
-// Vertical adjustment to the favicon when the tab has a large icon.
-static const int kAppTapFaviconVerticalAdjustment = 2;
-
 // When a non-mini-tab becomes a mini-tab the width of the tab animates. If
 // the width of a mini-tab is >= kMiniTabRendererAsNormalTabWidth then the tab
 // is rendered as a normal tab. This is done to avoid having the title
 // immediately disappear when transitioning a tab from normal to mini-tab.
 static const int kMiniTabRendererAsNormalTabWidth =
     browser_defaults::kMiniTabWidth + 30;
 
 // How opaque to make the hover state (out of 1).
 static const double kHoverOpacity = 0.33;
-static const double kHoverSlideOpacity = 0.5;
 
 // Opacity for non-active selected tabs.
 static const double kSelectedTabOpacity = .45;
 
 // Selected (but not active) tabs have their throb value scaled down by this.
 static const double kSelectedTabThrobScale = .5;
 
 Tab::TabImage Tab::tab_alpha_ = {0};
 Tab::TabImage Tab::tab_active_ = {0};
 Tab::TabImage Tab::tab_inactive_ = {0};
@@ skipping 218 matching lines @@
     close_button()->SetBounds(lb.width() + kCloseButtonHorzFuzz,
                               close_button_top, close_button_size.width(),
                               close_button_size.height());
     close_button()->SetVisible(true);
   } else {
     close_button()->SetBounds(0, 0, 0, 0);
     close_button()->SetVisible(false);
   }
 
   int title_left = favicon_bounds_.right() + kFaviconTitleSpacing;
-  int title_top = kTopPadding + (content_height - font_height()) / 2;
+  int title_top =
+      kTopPadding + kTitleTextOffsetY + (content_height - font_height()) / 2;
   // Size the Title text to fill the remaining space.
   if (!data().mini || width() >= kMiniTabRendererAsNormalTabWidth) {
     // If the user has big fonts, the title will appear rendered too far down
     // on the y-axis if we use the regular top padding, so we need to adjust it
     // so that the text appears centered.
     gfx::Size minimum_size = GetMinimumUnselectedSize();
     int text_height = title_top + font_height() + kBottomPadding;
     if (text_height > minimum_size.height())
       title_top -= (text_height - minimum_size.height()) / 2;
 
@@ skipping 309 matching lines @@
   tab_active_.image_r = rb.GetBitmapNamed(IDR_TAB_ACTIVE_RIGHT);
   tab_active_.l_width = tab_active_.image_l->width();
   tab_active_.r_width = tab_active_.image_r->width();
 
   tab_inactive_.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);
   tab_inactive_.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);
   tab_inactive_.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);
   tab_inactive_.l_width = tab_inactive_.image_l->width();
   tab_inactive_.r_width = tab_inactive_.image_r->width();
 }