Attempt 3 at a better touch tabstrip. There is still a bunch to do,

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"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/tabs/tab_resources.h"
 #include "chrome/browser/ui/views/tabs/tab_controller.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/animation/multi_animation.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/touch/touch_mode_support.h"
 #include "ui/gfx/canvas.h"
 #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/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
@@ skipping 32 matching lines @@
 #else
 static const int kCloseButtonVertFuzz = 0;
 #endif
 static const int kTabIconSize = gfx::kFaviconSize;
 // Additional horizontal offset for close button relative to title text.
 #if defined(USE_ASH)
 static const int kCloseButtonHorzFuzz = 7;
 #else
 static const int kCloseButtonHorzFuzz = 5;
 #endif
-static const int kTouchModeMinimumWidth = 160;
 
 // 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;
@@ skipping 79 matching lines @@
 
   gfx::Size minimum_size;
   minimum_size.set_width(kLeftPadding + kRightPadding);
   // Since we use bitmap images, the real minimum height of the image is
   // defined most accurately by the height of the end cap images.
   minimum_size.set_height(tab_active_.image_l->height());
   return minimum_size;
 }
 
 gfx::Size Tab::GetMinimumUnselectedSize() {
-  if (TouchModeSupport::IsTouchOptimized())
-    return GetTouchModeMinimumSize();
   return GetBasicMinimumUnselectedSize();
 }
 
 // static
 gfx::Size Tab::GetMinimumSelectedSize() {
-  if (TouchModeSupport::IsTouchOptimized())
-    return GetTouchModeMinimumSize();
   gfx::Size minimum_size = GetBasicMinimumUnselectedSize();
   minimum_size.set_width(kLeftPadding + gfx::kFaviconSize + kRightPadding);
   return minimum_size;
 }
 
 // static
 gfx::Size Tab::GetStandardSize() {
   gfx::Size standard_size = GetBasicMinimumUnselectedSize();
   standard_size.set_width(
       standard_size.width() + kFaviconTitleSpacing + kStandardTitleWidth);
   return standard_size;
 }
 
 // static
 int Tab::GetMiniWidth() {
   return browser_defaults::kMiniTabWidth;
 }
 
-// static
-gfx::Size Tab::GetTouchModeMinimumSize() {
-  InitTabResources();
-  gfx::Size size;
-  size.set_width(kTouchModeMinimumWidth);
-  size.set_height(tab_active_.image_l->height());
-  return size;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Tab, protected:
 
 const gfx::Rect& Tab::GetTitleBounds() const {
   return title_bounds_;
 }
 
 const gfx::Rect& Tab::GetIconBounds() const {
   return favicon_bounds_;
 }
@@ skipping 424 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();
 }