Add views::View::set_preferred_size, use it in a few places.

ui/views/controls/image_view.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/image_view.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 59 matching lines @@
 
 gfx::Rect ImageView::GetImageBounds() const {
   gfx::Size image_size = GetImageSize();
   return gfx::Rect(ComputeImageOrigin(image_size), image_size);
 }
 
 void ImageView::ResetImageSize() {
   image_size_set_ = false;
 }
 
-gfx::Size ImageView::GetPreferredSize() const {
-  gfx::Size size = GetImageSize();
-  size.Enlarge(GetInsets().width(), GetInsets().height());
-  return size;
-}
-
 bool ImageView::IsImageEqual(const gfx::ImageSkia& img) const {
   // Even though we copy ImageSkia in SetImage() the backing store
   // (ImageSkiaStorage) is not copied and may have changed since the last call
   // to SetImage(). The expectation is that SetImage() with different pixels is
   // treated as though the image changed. For this reason we compare not only
   // the backing store but also the pixels of the last image we painted.
   return image_.BackedBySameObjectAs(img) &&
       last_paint_scale_ != 0.0f &&
       last_painted_bitmap_pixels_ == GetBitmapPixels(img, last_paint_scale_);
 }
@@ skipping 77 matching lines @@
 
 bool ImageView::GetTooltipText(const gfx::Point& p,
                                base::string16* tooltip) const {
   if (tooltip_text_.empty())
     return false;
 
   *tooltip = GetTooltipText();
   return true;
 }
 
+gfx::Size ImageView::CalculatePreferredSize() const {
+  gfx::Size size = GetImageSize();
+  size.Enlarge(GetInsets().width(), GetInsets().height());
+  return size;
+}
+
 void ImageView::OnPaintImage(gfx::Canvas* canvas) {
   last_paint_scale_ = canvas->image_scale();
   last_painted_bitmap_pixels_ = NULL;
 
   if (image_.isNull())
     return;
 
   gfx::Rect image_bounds(GetImageBounds());
   if (image_bounds.IsEmpty())
     return;
 
   if (image_bounds.size() != gfx::Size(image_.width(), image_.height())) {
     // Resize case
     cc::PaintFlags flags;
     flags.setFilterQuality(kLow_SkFilterQuality);
     canvas->DrawImageInt(image_, 0, 0, image_.width(), image_.height(),
                          image_bounds.x(), image_bounds.y(),
                          image_bounds.width(), image_bounds.height(), true,
                          flags);
   } else {
     canvas->DrawImageInt(image_, image_bounds.x(), image_bounds.y());
   }
   last_painted_bitmap_pixels_ = GetBitmapPixels(image_, last_paint_scale_);
 }
 
 }  // namespace views