Refactoring to make adding ink drop animations easier

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/lazy_instance.h"
 #include "base/logging.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
@@ skipping 318 matching lines @@
   }
 
   gfx::Point label_origin(label_area.origin());
   if (!image_size.IsEmpty() && adjusted_alignment != gfx::ALIGN_RIGHT) {
     label_origin.set_x(image_origin.x() + image_size.width() +
         image_label_spacing_);
   }
 
   image_->SetBoundsRect(gfx::Rect(image_origin, image_size));
   label_->SetBoundsRect(gfx::Rect(label_origin, label_size));
+  CustomButton::Layout();
 }
 
 const char* LabelButton::GetClassName() const {
   return kViewClassName;
 }
 
 void LabelButton::EnableCanvasFlippingForRTLUI(bool flip) {
   CustomButton::EnableCanvasFlippingForRTLUI(flip);
   image_->EnableCanvasFlippingForRTLUI(flip);
 }
@@ skipping 161 matching lines @@
   GetExtraParams(params);
   return ui::NativeTheme::kHovered;
 }
 
 void LabelButton::ResetCachedPreferredSize() {
   cached_preferred_size_valid_ = false;
   cached_preferred_size_ = gfx::Size();
 }
 
 }  // namespace views