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

chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.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/ash/browser_non_client_frame_view_ash.h"
 
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 173 matching lines @@
       AddObserver(this);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameView overrides:
 
 gfx::Rect BrowserNonClientFrameViewAsh::GetBoundsForTabStrip(
     views::View* tabstrip) const {
   if (!tabstrip)
     return gfx::Rect();
-  int tabstrip_x =
-      avatar_button() ?
-      (avatar_button()->bounds().right() + kAvatarSideSpacing) :
-      kTabstripLeftSpacing;
-  int tabstrip_width =
-      size_button_->x() - kTabstripRightSpacing - tabstrip_x;
-  return gfx::Rect(tabstrip_x,
-                   GetHorizontalTabStripVerticalOffset(false),
-                   std::max(0, tabstrip_width),
+  TabStripInsets insets(GetTabStripInsets(false));
+  return gfx::Rect(insets.left, insets.top,
+                   std::max(0, width() - insets.left - insets.right),
                    tabstrip->GetPreferredSize().height());
 }
 
-int BrowserNonClientFrameViewAsh::GetHorizontalTabStripVerticalOffset(
-    bool force_restored) const {
-  return NonClientTopBorderHeight(force_restored);
+BrowserNonClientFrameView::TabStripInsets
+BrowserNonClientFrameViewAsh::GetTabStripInsets(bool force_restored) const {
+  int left = avatar_button() ? kAvatarSideSpacing +
+      browser_view()->GetOTRAvatarIcon().width() + kAvatarSideSpacing :
+      kTabstripLeftSpacing;
+  int right = frame_painter_->GetRightInset() + kTabstripRightSpacing;
+  return TabStripInsets(NonClientTopBorderHeight(force_restored), left, right);
 }
 
 void BrowserNonClientFrameViewAsh::UpdateThrobber(bool running) {
   if (window_icon_)
     window_icon_->Update();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // views::NonClientFrameView overrides:
 
@@ skipping 94 matching lines @@
     PaintToolbarBackground(canvas, mode.mode);
     // If we're fading in and have saved canvas, restore it now.
     if (fading_in)
       canvas->Restore();
   } else {
     PaintContentEdge(canvas);
   }
 }
 
 void BrowserNonClientFrameViewAsh::Layout() {
-  bool maximized_layout = UseShortHeader();
-  frame_painter_->LayoutHeader(this, maximized_layout);
+  frame_painter_->LayoutHeader(this, UseShortHeader());
   if (avatar_button())
     LayoutAvatar();
   BrowserNonClientFrameView::Layout();
 }
 
 std::string BrowserNonClientFrameViewAsh::GetClassName() const {
   return kViewClassName;
 }
 
 bool BrowserNonClientFrameViewAsh::HitTest(const gfx::Point& l) const {
@@ skipping 132 matching lines @@
     default:
       NOTREACHED();
       return false;
   }
 }
 
 void BrowserNonClientFrameViewAsh::LayoutAvatar() {
   DCHECK(avatar_button());
   gfx::ImageSkia incognito_icon = browser_view()->GetOTRAvatarIcon();
 
-  int avatar_bottom = GetHorizontalTabStripVerticalOffset(false) +
+  int avatar_bottom = GetTabStripInsets(false).top +
       browser_view()->GetTabStripHeight() - kAvatarBottomSpacing;
   int avatar_restored_y = avatar_bottom - incognito_icon.height();
   int avatar_y = frame()->IsMaximized() ?
       NonClientTopBorderHeight(false) + kContentShadowHeight:
       avatar_restored_y;
   gfx::Rect avatar_bounds(kAvatarSideSpacing,
                           avatar_y,
                           incognito_icon.width(),
                           avatar_bottom - avatar_y);
   avatar_button()->SetBoundsRect(avatar_bounds);
@@ skipping 29 matching lines @@
 
   // Paint the main toolbar image.  Since this image is also used to draw the
   // tab background, we must use the tab strip offset to compute the image
   // source y position.  If you have to debug this code use an image editor
   // to paint a diagonal line through the toolbar image and ensure it lines up
   // across the tab and toolbar.
   gfx::ImageSkia* theme_toolbar =
       browser_view()->GetToolbarBackgroundImage(mode);
   canvas->TileImageInt(
       *theme_toolbar,
-      x, bottom_y - GetHorizontalTabStripVerticalOffset(false),
+      x, bottom_y - GetTabStripInsets(false).top,
       x, bottom_y,
       w, theme_toolbar->height());
 
   // The content area line has a shadow that extends a couple of pixels above
   // the toolbar bounds.
   const int kContentShadowHeight = 2;
   gfx::ImageSkia* toolbar_top = tp->GetImageSkiaNamed(
       chrome::search::IsInstantExtendedAPIEnabled(
           browser_view()->browser()->profile()) ?
               IDR_TOOLBAR_SHADE_TOP_SEARCH : IDR_TOOLBAR_SHADE_TOP);
@@ skipping 64 matching lines @@
 BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImage() const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
       browser_view()->IsBrowserTypeNormal() &&
       !browser_view()->IsOffTheRecord()) {
     return tp->GetImageSkiaNamed(ShouldPaintAsActive() ?
         IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE);
   }
   return NULL;
 }