diff options
| author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-15 18:02:30 +0000 |
|---|---|---|
| committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-15 18:02:30 +0000 |
| commit | 154f8bcac65142d7ae6733204c15ae52cfa320c6 (patch) | |
| tree | d7375c1119946c2914ee79ef2c0e8aa195b1fbe9 /chrome/views/button.cc | |
| parent | 8144d0cea4e142ff7d7a75c84240a4bb8a7fb3a4 (diff) | |
| download | chromium_src-154f8bcac65142d7ae6733204c15ae52cfa320c6.zip chromium_src-154f8bcac65142d7ae6733204c15ae52cfa320c6.tar.gz chromium_src-154f8bcac65142d7ae6733204c15ae52cfa320c6.tar.bz2 | |
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
Diffstat (limited to 'chrome/views/button.cc')
| -rw-r--r-- | chrome/views/button.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/views/button.cc b/chrome/views/button.cc index 5489841..0cc98ae 100644 --- a/chrome/views/button.cc +++ b/chrome/views/button.cc @@ -57,14 +57,10 @@ void Button::SetImageAlignment(HorizontalAlignment h_align, SchedulePaint(); } -void Button::GetPreferredSize(CSize *result) { - if (!images_[BS_NORMAL].isNull()) { - result->cx = images_[BS_NORMAL].width(); - result->cy = images_[BS_NORMAL].height(); - } else { - result->cx = kDefaultWidth; - result->cy = kDefaultHeight; - } +gfx::Size Button::GetPreferredSize() { + if (!images_[BS_NORMAL].isNull()) + return gfx::Size(images_[BS_NORMAL].width(), images_[BS_NORMAL].height()); + return gfx::Size(kDefaultWidth, kDefaultHeight); } // Set the tooltip text for this button. |