WIP - loop in LayoutManager for preferred size changes

ui/views/controls/button/label_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/label_button.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 93 matching lines @@
 void LabelButton::SetFont(const gfx::Font& font) {
   label_->SetFont(font);
 }
 
 gfx::HorizontalAlignment LabelButton::GetHorizontalAlignment() const {
   return label_->horizontal_alignment();
 }
 
 void LabelButton::SetHorizontalAlignment(gfx::HorizontalAlignment alignment) {
   label_->SetHorizontalAlignment(alignment);
-  InvalidateLayout();
+  Layout();
 }
 
 void LabelButton::SetIsDefault(bool is_default) {
   if (is_default == is_default_)
     return;
   is_default_ = is_default;
   ui::Accelerator accel(ui::VKEY_RETURN, ui::EF_NONE);
   is_default_ ? AddAccelerator(accel) : RemoveAccelerator(accel);
 
   // STYLE_BUTTON uses bold text to indicate default buttons.
@@ skipping 20 matching lines @@
     set_focusable(true);
   }
   if (style == STYLE_BUTTON) {
     set_min_size(gfx::Size(70, 31));
     const SkColor color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_WindowBackground);
     label_->SetShadowColors(color, color);
     label_->SetShadowOffset(0, 1);
   }
   // Invalidate the layout to pickup the new insets from the border.
-  InvalidateLayout();
+  Layout();
   ResetColorsFromNativeTheme();
 }
 
 gfx::Size LabelButton::GetPreferredSize() {
   const gfx::Font font = label_->font();
   // Use a temporary label copy for sizing to avoid calculation side-effects.
   // Use bold text for STYLE_BUTTON to avoid changing size when made default.
   Label label(label_->text(), style_ == STYLE_BUTTON ?
       font.DeriveFont(0, font.GetStyle() | gfx::Font::BOLD) : font);
   label.SetMultiLine(GetTextMultiLine());
@@ skipping 173 matching lines @@
   return ui::NativeTheme::kNormal;
 }
 
 ui::NativeTheme::State LabelButton::GetForegroundThemeState(
     ui::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
   return ui::NativeTheme::kHovered;
 }
 
 }  // namespace views