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/native_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/native_button.cc')
| -rw-r--r-- | chrome/views/native_button.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/views/native_button.cc b/chrome/views/native_button.cc index 55323c6..ee2288f 100644 --- a/chrome/views/native_button.cc +++ b/chrome/views/native_button.cc @@ -33,7 +33,7 @@ void NativeButton::SetPadding(CSize size) { padding_ = size; } -void NativeButton::GetPreferredSize(CSize *out) { +gfx::Size NativeButton::GetPreferredSize() { HWND hwnd = GetNativeControlHWND(); if (hwnd) { SIZE sz = {0, 0}; @@ -54,8 +54,9 @@ void NativeButton::GetPreferredSize(CSize *out) { sz.cy = std::max(static_cast<int>(sz.cy), font_.vertical_dlus_to_pixels(min_dlu_size_.height())); } - *out = sz; + return gfx::Size(sz.cx, sz.cy); } + return gfx::Size(); } void NativeButton::SetLabel(const std::wstring& l) { |