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

ui/views/controls/button/text_button.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/controls/button/text_button.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
@@ skipping 60 matching lines @@
 TextButtonBorder::TextButtonBorder() {
 }
 
 TextButtonBorder::~TextButtonBorder() {
 }
 
 gfx::Insets TextButtonBorder::GetInsets() const {
   return insets_;
 }
 
+gfx::Size TextButtonBorder::GetMinimumSize() const {
+  return gfx::Size();
+}
+
 void TextButtonBorder::SetInsets(const gfx::Insets& insets) {
   insets_ = insets;
 }
 
 TextButtonBorder* TextButtonBorder::AsTextButtonBorder() {
   return this;
 }
 
 const TextButtonBorder* TextButtonBorder::AsTextButtonBorder() const {
   return this;
@@ skipping 37 matching lines @@
       canvas->SaveLayerAlpha(static_cast<uint8>(
           button->GetAnimation()->CurrentValueBetween(0, 255)));
       painter->Paint(canvas, view.size());
       canvas->Restore();
     } else {
       painter->Paint(canvas, view.size());
     }
   }
 }
 
+gfx::Size TextButtonDefaultBorder::GetMinimumSize() const {
+  gfx::Size size;
+  if (normal_painter_)
+    size.SetToMax(normal_painter_->GetMinimumSize());
+  if (hot_painter_)
+    size.SetToMax(hot_painter_->GetMinimumSize());
+  if (pushed_painter_)
+    size.SetToMax(pushed_painter_->GetMinimumSize());
+  return size;
+}
+
 
 // TextButtonNativeThemeBorder ------------------------------------------------
 
 TextButtonNativeThemeBorder::TextButtonNativeThemeBorder(
     NativeThemeDelegate* delegate)
     : delegate_(delegate) {
   SetInsets(gfx::Insets(kPreferredNativeThemePaddingVertical,
                         kPreferredNativeThemePaddingHorizontal,
                         kPreferredNativeThemePaddingVertical,
                         kPreferredNativeThemePaddingHorizontal));
@@ skipping 564 matching lines @@
   if (show_multiple_icon_states_) {
     if (has_hover_icon_ && (state() == STATE_HOVERED))
       return icon_hover_;
     if (has_pushed_icon_ && (state() == STATE_PRESSED))
       return icon_pushed_;
   }
   return icon_;
 }
 
 }  // namespace views