Add GetMinimumSize() for Borders, and make LabelButton auto-size to at least as

ui/views/bubble/bubble_border.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 "ui/views/bubble/bubble_border.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 145 matching lines @@
       shadow_(shadow),
       background_color_(color) {
   DCHECK(shadow < SHADOW_COUNT);
   images_ = GetBorderImages(shadow);
 }
 
 BubbleBorder::~BubbleBorder() {}
 
 gfx::Rect BubbleBorder::GetBounds(const gfx::Rect& anchor_rect,
                                   const gfx::Size& contents_size) const {
-  // Enlarge the contents size by the thickness of the border images.
-  gfx::Size size(contents_size);
-  const gfx::Insets insets = GetInsets();
-  size.Enlarge(insets.width(), insets.height());
-
-  // Ensure the bubble is large enough to not overlap border and arrow images.
-  const int min = 2 * images_->border_thickness;
-  const int min_with_arrow_width = min + images_->top_arrow.width();
-  const int min_with_arrow_thickness = images_->border_thickness +
-      std::max(images_->arrow_thickness + images_->border_interior_thickness,
-               images_->border_thickness);
-  // Only take arrow image sizes into account when the bubble tip is shown.
-  if (arrow_paint_type_ == PAINT_TRANSPARENT || !has_arrow(arrow_))
-    size.SetToMax(gfx::Size(min, min));
-  else if (is_arrow_on_horizontal(arrow_))
-    size.SetToMax(gfx::Size(min_with_arrow_width, min_with_arrow_thickness));
-  else
-    size.SetToMax(gfx::Size(min_with_arrow_thickness, min_with_arrow_width));
-
   int x = anchor_rect.x();
   int y = anchor_rect.y();
   int w = anchor_rect.width();
   int h = anchor_rect.height();
+  const gfx::Size size(GetSizeForContentsSize(contents_size));
   const int arrow_offset = GetArrowOffset(size);
   const int arrow_size =
       images_->arrow_interior_thickness + kStroke - images_->arrow_thickness;
   const bool mid_anchor = alignment_ == ALIGN_ARROW_TO_MID_ANCHOR;
 
   // Calculate the bubble coordinates based on the border and arrow settings.
   if (is_arrow_on_horizontal(arrow_)) {
     if (is_arrow_on_left(arrow_)) {
       x += mid_anchor ? w / 2 - arrow_offset : kStroke - GetBorderThickness();
     } else if (is_arrow_at_center(arrow_)) {
@@ skipping 69 matching lines @@
   int first_inset = inset;
   int second_inset = std::max(inset, images_->arrow_thickness);
   if (is_arrow_on_horizontal(arrow_) ?
       is_arrow_on_top(arrow_) : is_arrow_on_left(arrow_))
     std::swap(first_inset, second_inset);
   return is_arrow_on_horizontal(arrow_) ?
       gfx::Insets(first_inset, inset, second_inset, inset) :
       gfx::Insets(inset, first_inset, inset, second_inset);
 }
 
+gfx::Size BubbleBorder::GetMinimumSize() const {
+  return GetSizeForContentsSize(gfx::Size());
+}
+
+gfx::Size BubbleBorder::GetSizeForContentsSize(
+    const gfx::Size& contents_size) const {
+  // Enlarge the contents size by the thickness of the border images.
+  gfx::Size size(contents_size);
+  const gfx::Insets insets = GetInsets();
+  size.Enlarge(insets.width(), insets.height());
+
+  // Ensure the bubble is large enough to not overlap border and arrow images.
+  const int min = 2 * images_->border_thickness;
+  const int min_with_arrow_width = min + images_->top_arrow.width();
+  const int min_with_arrow_thickness = images_->border_thickness +
+      std::max(images_->arrow_thickness + images_->border_interior_thickness,
+               images_->border_thickness);
+  // Only take arrow image sizes into account when the bubble tip is shown.
+  if (arrow_paint_type_ == PAINT_TRANSPARENT || !has_arrow(arrow_))
+    size.SetToMax(gfx::Size(min, min));
+  else if (is_arrow_on_horizontal(arrow_))
+    size.SetToMax(gfx::Size(min_with_arrow_width, min_with_arrow_thickness));
+  else
+    size.SetToMax(gfx::Size(min_with_arrow_thickness, min_with_arrow_width));
+  return size;
+}
+
 gfx::ImageSkia* BubbleBorder::GetArrowImage() const {
   if (!has_arrow(arrow_))
     return NULL;
   if (is_arrow_on_horizontal(arrow_)) {
     return is_arrow_on_top(arrow_) ?
         &images_->top_arrow : &images_->bottom_arrow;
   }
   return is_arrow_on_left(arrow_) ?
       &images_->left_arrow : &images_->right_arrow;
 }
@@ skipping 72 matching lines @@
   SkPath path;
   gfx::Rect bounds(view->GetLocalBounds());
   bounds.Inset(border_->GetInsets());
 
   SkScalar radius = SkIntToScalar(border_->GetBorderCornerRadius());
   path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius);
   canvas->DrawPath(path, paint);
 }
 
 }  // namespace views