Account for minimum tabstrip width in opaque browser frame.

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

 // Copyright (c) 2011 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/frame/opaque_browser_frame_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 284 matching lines @@
       kIconLeftSpacing +
       (delegate && delegate->ShouldShowWindowIcon() ?
        (IconSize() + kTitleLogoSpacing) : 0);
 #if !defined(OS_CHROMEOS)
   min_titlebar_width +=
       minimize_button_->GetMinimumSize().width() +
       restore_button_->GetMinimumSize().width() +
       close_button_->GetMinimumSize().width();
 #endif
   min_size.set_width(std::max(min_size.width(), min_titlebar_width));
+
+  // Ensure that the minimum width is enough to hold a tab strip with minimum
+  // width at its usual insets.
+  if (browser_view_->IsTabStripVisible()) {
+    AbstractTabStripView* tabstrip = browser_view_->tabstrip();
+    int min_tabstrip_width = tabstrip->GetMinimumSize().width();
+    int min_tabstrip_area_width =
+        width() - GetBoundsForTabStrip(tabstrip).width() + min_tabstrip_width;

[Peter Kasting, 2011/10/06 20:31:33]

This worries me because it is flexible.  For example, it might allow a Chrome
window with no avatar showing to shrink to a small size, but then if we show an
avatar for multiprofile or incognito, the window will be too small.  It seems
like we can solve this by
(a) Moving this calculation up into the code just above that's already
accounting for the other things in the frame here -- we just need to know how
the tabstrip is spaced relative to the caption buttons, and
(b) Adding something about the avatar to that calculation as well.

+    min_size.set_width(std::max(min_tabstrip_area_width, min_size.width()));
+  }
+
   return min_size;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, views::NonClientFrameView implementation:
 
 gfx::Rect OpaqueBrowserFrameView::GetBoundsForClientView() const {
   return client_view_bounds_;
 }
 
@@ skipping 822 matching lines @@
         g_browser_process->profile_manager()->GetProfileInfoCache();
     Profile* profile = browser_view_->browser()->profile();
     size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
     if (index != std::string::npos) {
       avatar_button_->SetIcon(cache.GetAvatarIconOfProfileAtIndex(index));
       avatar_button_->SetText(UTF16ToWideHack(
           cache.GetNameOfProfileAtIndex(index)));
     }
   }
 }