Convert GetPreferredSize from:...

chrome/views/text_button.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_TEXT_BUTTON_H__
 #define CHROME_VIEWS_TEXT_BUTTON_H__
 
 #include <windows.h>
 
 #include "chrome/common/gfx/chrome_font.h"
@@ skipping 57 matching lines @@
 public:
   TextButton(const std::wstring& text);
   virtual ~TextButton();
 
   typedef enum TextAlignment {
     ALIGN_LEFT,
     ALIGN_CENTER,
     ALIGN_RIGHT
   };
 
-  void GetPreferredSize(CSize* result);
-  void GetMinimumSize(CSize* result);
+  virtual gfx::Size GetPreferredSize();
+  virtual gfx::Size GetMinimumSize();
   virtual bool OnMousePressed(const ChromeViews::MouseEvent& e);
 
   // Call SetText once per string in your set of possible values at
   // button creation time, so that it can contain the largest of them
   // and avoid resizing the button when the text changes.
   virtual void SetText(const std::wstring& text);
 
   void TextButton::SetTextAlignment(TextAlignment alignment) {
     alignment_ = alignment;
   }
@@ skipping 16 matching lines @@
   // Sets the enabled state. Setting the enabled state resets the color.
   virtual void SetEnabled(bool enabled);
 
   // Sets the max width. The preferred width of the button will never be larger
   // then the specified value. A value <= 0 indicates the preferred width
   // is not constrained in anyway.
   void set_max_width(int max_width) { max_width_ = max_width; }
 
  private:
   std::wstring text_;
-  CSize text_size_;
+  gfx::Size text_size_;
 
   // Track the size of the largest text string seen so far, so that
   // changing text_ will not resize the button boundary.
-  CSize max_text_size_;
+  gfx::Size max_text_size_;
 
   TextAlignment alignment_;
 
   ChromeFont font_;
 
   // Text color.
   SkColor color_;
 
   SkBitmap icon_;
 
   // See setter for details.
   int max_width_;
 
   DISALLOW_EVIL_CONSTRUCTORS(TextButton);
 };
 
 
 } // namespace
 
 #endif  // CHROME_VIEWS_TEXT_BUTTON_H__