Makes the min window size include the OTR image and caption buttons on

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"
 
 #if defined(OS_WIN)
 #include <windowsx.h>
 #endif
 
@@ skipping 1215 matching lines @@
   // If the active tab is being dragged, it goes last.
   if (active_tab && is_dragging)
     active_tab->Paint(canvas);
 }
 
 std::string TabStrip::GetClassName() const {
   return kViewClassName;
 }
 
 gfx::Size TabStrip::GetPreferredSize() {
-  // Report the minimum width as the size required for a single selected tab
-  // plus the new tab button. Don't base it on the actual number of tabs because
-  // it's undesirable to have the minimum window size change when a new tab is
-  // opened.
-  int needed_width = Tab::GetMinimumSelectedSize().width() -
-      tab_h_offset() + new_tab_button_width();
+  // For stacked tabs the minimum size is calculated as the size needed to
+  // handle showing any number of tabs. Otherwise report the minimum width as
+  // the size required for a single selected tab plus the new tab button. Don't
+  // base it on the actual number of tabs because it's undesirable to have the
+  // minimum window size change when a new tab is opened.
+  int needed_width;
+  if (touch_layout_.get() || adjust_layout_) {
+    needed_width = Tab::GetTouchWidth() +
+        (2 * kStackedPadding * kMaxStackedCount);
+  } else {
+    needed_width = Tab::GetMinimumSelectedSize().width();
+  }
+  needed_width += new_tab_button_width();
   return gfx::Size(needed_width, Tab::GetMinimumUnselectedSize().height());
 }
 
 void TabStrip::OnDragEntered(const DropTargetEvent& event) {
   // Force animations to stop, otherwise it makes the index calculation tricky.
   StopAnimating(true);
 
   UpdateDropIndex(event);
 }
 
@@ skipping 1082 matching lines @@
   GenerateIdealBounds();
   AnimateToIdealBounds();
 }
 
 bool TabStrip::NeedsTouchLayout() const {
   if (layout_type_ == TAB_STRIP_LAYOUT_SHRINK)
     return false;
 
   int mini_tab_count = GetMiniTabCount();
   int normal_count = tab_count() - mini_tab_count;
-  if (normal_count == 0 || normal_count == mini_tab_count)
+  if (normal_count <= 1 || normal_count == mini_tab_count)
     return false;
   int x = GetStartXForNormalTabs();
   int available_width = width() - x - new_tab_button_width();
   return (Tab::GetTouchWidth() * normal_count +
           tab_h_offset() * (normal_count - 1)) > available_width;
 }