Convert GetPreferredSize from:

void GetPreferredSize(CSize* out);

to:

gfx::Size GetPreferredSize();

.. and update some other places to use gfx::Size as well.

http://crbug.com/2186


Review URL: http://codereview.chromium.org/7344

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3400 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/chrome/views/image_view.h b/chrome/views/image_view.h
index 1f25550..ce18b81 100644
--- a/chrome/views/image_view.h
+++ b/chrome/views/image_view.h
@@ -48,12 +48,12 @@ class ImageView : public View {
   const SkBitmap& GetImage();
 
   // Set the desired image size for the receiving ImageView.
-  void SetImageSize(const CSize& image_size);
+  void SetImageSize(const gfx::Size& image_size);
 
   // Return the preferred size for the receiving view. Returns false if the
   // preferred size is not defined, which means that the view uses the image
   // size.
-  bool GetImageSize(CSize* image_size);
+  bool GetImageSize(gfx::Size* image_size);
 
   // Reset the image size to the current image dimensions.
   void ResetImageSize();
@@ -72,7 +72,7 @@ class ImageView : public View {
 
   // Return whether the image should be centered inside the view.
   // Overriden from View
-  virtual void GetPreferredSize(CSize* out);
+  virtual gfx::Size GetPreferredSize();
   virtual void Paint(ChromeCanvas* canvas);
 
   // Overriden from View.
@@ -87,7 +87,7 @@ class ImageView : public View {
   bool image_size_set_;
 
   // The actual image size.
-  CSize image_size_;
+  gfx::Size image_size_;
 
   // The underlying bitmap.
   SkBitmap image_;