Apply View::set_preferred_size in some more places.

ui/views/controls/button/image_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/image_button.h"
 
 #include <utility>
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
@@ skipping 80 matching lines @@
   if (minimum_image_size_ == size)
     return;
 
   minimum_image_size_ = size;
   PreferredSizeChanged();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImageButton, View overrides:
 
-gfx::Size ImageButton::GetPreferredSize() const {
-  gfx::Size size(kDefaultWidth, kDefaultHeight);
-  if (!images_[STATE_NORMAL].isNull()) {
-    size = gfx::Size(images_[STATE_NORMAL].width(),
-                     images_[STATE_NORMAL].height());
-  }
-
-  size.SetToMax(minimum_image_size_);
-
-  gfx::Insets insets = GetInsets();
-  size.Enlarge(insets.width(), insets.height());
-  return size;
-}
-
 const char* ImageButton::GetClassName() const {
   return kViewClassName;
 }
 
 void ImageButton::OnPaint(gfx::Canvas* canvas) {
   // Call the base class first to paint any background/borders.
   View::OnPaint(canvas);
 
   // TODO(estade|tdanderson|bruthig): The ink drop layer should be positioned
   // behind the button's image which means the image needs to be painted to its
@@ skipping 10 matching lines @@
     gfx::Point position = ComputeImagePaintPosition(img);
     if (!background_image_.isNull())
       canvas->DrawImageInt(background_image_, position.x(), position.y());
 
     canvas->DrawImageInt(img, position.x(), position.y());
   }
 
   Painter::PaintFocusPainter(this, canvas, focus_painter());
 }
 
+gfx::Size ImageButton::CalculatePreferredSize() const {
+  gfx::Size size(kDefaultWidth, kDefaultHeight);
+  if (!images_[STATE_NORMAL].isNull()) {
+    size = gfx::Size(images_[STATE_NORMAL].width(),
+                     images_[STATE_NORMAL].height());
+  }
+
+  size.SetToMax(minimum_image_size_);
+
+  gfx::Insets insets = GetInsets();
+  size.Enlarge(insets.width(), insets.height());
+  return size;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ImageButton, protected:
 
 void ImageButton::OnFocus() {
   CustomButton::OnFocus();
   if (focus_painter_.get())
     SchedulePaint();
 }
 
 void ImageButton::OnBlur() {
@@ skipping 132 matching lines @@
   // accessible toggle button.
   if ((toggled_ && !images_[ButtonState::STATE_NORMAL].isNull()) ||
       (!toggled_ && !alternate_images_[ButtonState::STATE_NORMAL].isNull())) {
     node_data->role = ui::AX_ROLE_TOGGLE_BUTTON;
     if (toggled_)
       node_data->AddState(ui::AX_STATE_PRESSED);
   }
 }
 
 }  // namespace views