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

chrome/browser/ui/views/avatar_label.cc

 // Copyright 2013 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/avatar_label.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/painter.h"
 
 namespace {
 
 // A special text button border for the managed user avatar label.
 class AvatarLabelBorder: public views::TextButtonBorder {
  public:
   explicit AvatarLabelBorder();
 
   // views::TextButtonBorder:
   virtual void Paint(const views::View& view, gfx::Canvas* canvas) OVERRIDE;
+  virtual gfx::Size GetMinimumSize() const OVERRIDE;
 
  private:
   scoped_ptr<views::Painter> painter_;
 
   DISALLOW_COPY_AND_ASSIGN(AvatarLabelBorder);
 };
 
 AvatarLabelBorder::AvatarLabelBorder() {
   const int kHorizontalInsetRight = 10;
   const int kHorizontalInsetLeft = 43;
@@ skipping 35 matching lines @@
       background_color, SK_ColorBLACK, kAlphaForBlending));
   canvas->DrawRoundRect(rect, kRadius, paint);
 
   // Now paint the inner background using the color provided by the
   // ThemeProvider.
   paint.setColor(background_color);
   rect = gfx::Rect(2, 2, view.size().width() - 4, view.size().height() - 4);
   canvas->DrawRoundRect(rect, kRadius, paint);
 }
 
+gfx::Size AvatarLabelBorder::GetMinimumSize() const {
+  gfx::Size size(4, 4);

[msw, 2013/11/22 18:00:25]

nit: should 4 be declared as a file-local constant for this and Paint?

[Peter Kasting, 2013/11/22 22:07:55]

We'd declare 2 rather than 4 if we were going to declare anything; I don't mind
such a declaration in principle but I don't understand the code well enough to
give such a constant a good, accurate name.

+  size.SetToMax(painter_->GetMinimumSize());
+  return size;
+}
+
 }  // namespace
 
 AvatarLabel::AvatarLabel(BrowserView* browser_view)
     : TextButton(NULL,
                  l10n_util::GetStringUTF16(IDS_MANAGED_USER_AVATAR_LABEL)),
       browser_view_(browser_view) {
   SetFont(ui::ResourceBundle::GetSharedInstance().GetFont(
       ui::ResourceBundle::BaseFont));
   ClearMaxTextSize();
   set_border(new AvatarLabelBorder);
@@ skipping 12 matching lines @@
 
 void AvatarLabel::UpdateLabelStyle() {
   SkColor color_label = browser_view_->frame()->GetThemeProvider()->GetColor(
       ThemeProperties::COLOR_MANAGED_USER_LABEL);
   SetEnabledColor(color_label);
   SetHighlightColor(color_label);
   SetHoverColor(color_label);
   SetDisabledColor(color_label);
   SchedulePaint();
 }