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/text_button.h b/chrome/views/text_button.h
index dcfcca1..2b4a01f 100644
--- a/chrome/views/text_button.h
+++ b/chrome/views/text_button.h
@@ -75,8 +75,8 @@ public:
     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
@@ -113,11 +113,11 @@ public:
 
  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_;