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

ui/views/controls/image_view.h

Index: ui/views/controls/image_view.h
diff --git a/ui/views/controls/image_view.h b/ui/views/controls/image_view.h
index ca103c27536daabb4e4cefad719baa3db142abda..393b934592aa01376a89c91bde855e78db31f8b1 100644
--- a/ui/views/controls/image_view.h
+++ b/ui/views/controls/image_view.h
@@ -73,12 +73,12 @@ class VIEWS_EXPORT ImageView : public View {
   base::string16 GetTooltipText() const;
 
   // Overriden from View:
-  gfx::Size GetPreferredSize() const override;
   void OnPaint(gfx::Canvas* canvas) override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   const char* GetClassName() const override;
   bool GetTooltipText(const gfx::Point& p,
                       base::string16* tooltip) const override;
+  gfx::Size CalculatePreferredSize() const override;
 
  private:
   void OnPaintImage(gfx::Canvas* canvas);