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

ui/views/controls/button/text_button.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 13 matching lines @@
 // button.
 class VIEWS_EXPORT TextButtonBorder : public Border {
  public:
   TextButtonBorder();
   virtual ~TextButtonBorder();
 
   void SetInsets(const gfx::Insets& insets);
 
   // Border:
   virtual gfx::Insets GetInsets() const OVERRIDE;
+  virtual gfx::Size GetMinimumSize() const OVERRIDE;
 
  private:
   // Border:
   virtual TextButtonBorder* AsTextButtonBorder() OVERRIDE;
   virtual const TextButtonBorder* AsTextButtonBorder() const OVERRIDE;
 
   gfx::Insets insets_;
 
   DISALLOW_COPY_AND_ASSIGN(TextButtonBorder);
 };
@@ skipping 11 matching lines @@
   virtual ~TextButtonDefaultBorder();
 
   // TextButtonDefaultBorder takes and retains ownership of these |painter|s.
   void set_normal_painter(Painter* painter) { normal_painter_.reset(painter); }
   void set_hot_painter(Painter* painter) { hot_painter_.reset(painter); }
   void set_pushed_painter(Painter* painter) { pushed_painter_.reset(painter); }
 
  private:
   // TextButtonBorder:
   virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE;
+  virtual gfx::Size GetMinimumSize() const OVERRIDE;
 
   scoped_ptr<Painter> normal_painter_;
   scoped_ptr<Painter> hot_painter_;
   scoped_ptr<Painter> pushed_painter_;
 
   int vertical_padding_;
 
   DISALLOW_COPY_AND_ASSIGN(TextButtonDefaultBorder);
 };
 
 
 // A Border subclass that paints a TextButton's background layer using the
 // platform's native theme look.  This handles normal/disabled/hot/pressed
 // states, with possible animation between states.
 class VIEWS_EXPORT TextButtonNativeThemeBorder : public TextButtonBorder {
  public:
   explicit TextButtonNativeThemeBorder(NativeThemeDelegate* delegate);
   virtual ~TextButtonNativeThemeBorder();
 
   // TextButtonBorder:
   virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE;
+  // We don't override GetMinimumSize(), since there's no easy way to calculate
+  // the minimum size required by the various theme components.
 
  private:
   // The delegate the controls the appearance of this border.
   NativeThemeDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(TextButtonNativeThemeBorder);
 };
 
 
 // A base class for different types of buttons, like push buttons, radio
@@ skipping 271 matching lines @@
   // True if the button should ignore the minimum size for the platform. Default
   // is true. Set to false to prevent narrower buttons.
   bool ignore_minimum_size_;
 
   DISALLOW_COPY_AND_ASSIGN(TextButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_