views::ImageButton: Added SetMinimumImageSize; removed SetPreferredSize.

ui/views/controls/button/image_button.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/layout.h"
@@ skipping 39 matching lines @@
   void SetBackground(SkColor color,
                      const gfx::ImageSkia* image,
                      const gfx::ImageSkia* mask);
 
   // Sets how the image is laid out within the button's bounds.
   void SetImageAlignment(HorizontalAlignment h_align,
                          VerticalAlignment v_align);
 
   void SetFocusPainter(scoped_ptr<Painter> focus_painter);
 
-  // Sets preferred size, so it could be correctly positioned in layout even if
-  // it is NULL.
-  void SetPreferredSize(const gfx::Size& preferred_size) {
-    preferred_size_ = preferred_size;
-  }
+  // The minimum size of the contents (not including the border). The contents
+  // will be at least this size, but may be larger if the image itself is
+  // larger.
+  const gfx::Size& minimum_image_size() const { return minimum_image_size_; }
+  void SetMinimumImageSize(const gfx::Size& size);
 
   // Whether we should draw our images resources horizontally flipped.
   void SetDrawImageMirrored(bool mirrored) {
     draw_image_mirrored_ = mirrored;
   }
 
   // Overridden from View:
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
@@ skipping 22 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(ImageButtonTest, ImagePositionWithBorder);
   FRIEND_TEST_ALL_PREFIXES(ImageButtonTest, LeftAlignedMirrored);
   FRIEND_TEST_ALL_PREFIXES(ImageButtonTest, RightAlignedMirrored);
 
   // Returns the correct position of the image for painting.
   gfx::Point ComputeImagePaintPosition(const gfx::ImageSkia& image);
 
   // Image alignment.
   HorizontalAlignment h_alignment_;
   VerticalAlignment v_alignment_;
-  gfx::Size preferred_size_;
+  gfx::Size minimum_image_size_;
 
   // Whether we draw our resources horizontally flipped. This can happen in the
   // linux titlebar, where image resources were designed to be flipped so a
   // small curved corner in the close button designed to fit into the frame
   // resources.
   bool draw_image_mirrored_;
 
   scoped_ptr<Painter> focus_painter_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageButton);
@@ skipping 44 matching lines @@
   // The parent class's tooltip_text_ is displayed when not toggled, and
   // this one is shown when toggled.
   base::string16 toggled_tooltip_text_;
 
   DISALLOW_COPY_AND_ASSIGN(ToggleImageButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_