Convert GetPreferredSize from:...

chrome/views/image_view.h

 // Copyright (c) 2006-2008 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 CHROME_VIEWS_IMAGE_VIEW_H__
 #define CHROME_VIEWS_IMAGE_VIEW_H__
 
 #include <windows.h>
 
 #include "chrome/views/view.h"
@@ skipping 30 matching lines @@
   // Set the bitmap that should be displayed from a pointer. Reset the image
   // if the pointer is NULL. The pointer contents is copied in the receiver's
   // bitmap.
   void SetImage(SkBitmap* bm);
 
   // Returns the bitmap currently displayed or NULL of none is currently set.
   // The returned bitmap is still owned by the ImageView.
   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();
 
   // Set / Get the horizontal alignment.
   void SetHorizontalAlignment(Alignment ha);
   Alignment GetHorizontalAlignment();
 
   // Set / Get the vertical alignment.
   void SetVerticalAlignment(Alignment va);
   Alignment GetVerticalAlignment();
 
   // Set / Get the tooltip text.
   void SetTooltipText(const std::wstring& tooltip);
   std::wstring GetTooltipText();
 
   // 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.
   virtual bool GetTooltipText(int x, int y, std::wstring* tooltip);
 
  private:
   // Compute the image origin given the desired size and the receiver alignment
   // properties.
   void ComputeImageOrigin(int image_width, int image_height, int *x, int *y);
 
   // Whether the image size is set.
   bool image_size_set_;
 
   // The actual image size.
-  CSize image_size_;
+  gfx::Size image_size_;
 
   // The underlying bitmap.
   SkBitmap image_;
 
   // Horizontal alignment.
   Alignment horiz_alignment_;
 
   // Vertical alignment.
   Alignment vert_alignment_;
 
   // The current tooltip text.
   std::wstring tooltip_text_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ImageView);
 };
 
 }
 
 #endif  // CHROME_VIEWS_IMAGE_VIEW_H__