Don't allow the browser window to be resized so small that layout starts breaking horribly. When it _is_ small, draw the frame correctly.

This is an incomplete fix; only non-Aero main/popup/app windows are handled so far, but this was becoming hairy enough I wanted to checkpoint it.

BUG=9885
Review URL: http://codereview.chromium.org/100005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14618 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 2 deletions

diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index b5298db..34c4f9b 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -527,6 +527,10 @@ gfx::Size BookmarkBarView::GetPreferredSize() {
   return prefsize;
 }
 
+gfx::Size BookmarkBarView::GetMinimumSize() {
+  return gfx::Size(0, kBarHeight);
+}
+
 void BookmarkBarView::Layout() {
   if (!GetParent())
     return;
@@ -941,8 +945,9 @@ bool BookmarkBarView::OnNewTabPage() {
           browser_->GetSelectedTabContents()->IsBookmarkBarAlwaysVisible());
 }
 
-int BookmarkBarView::GetToolbarOverlap() {
-  return static_cast<int>(size_animation_->GetCurrentValue() * kToolbarOverlap);
+int BookmarkBarView::GetToolbarOverlap(bool return_max) {
+  return static_cast<int>(kToolbarOverlap *
+      (return_max ? 1.0 : size_animation_->GetCurrentValue()));
 }
 
 void BookmarkBarView::AnimationProgressed(const Animation* animation) {