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/client_view.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/client_view.cc')
| -rw-r--r-- | chrome/views/client_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/views/client_view.cc b/chrome/views/client_view.cc index ba994cd..5072acd 100644 --- a/chrome/views/client_view.cc +++ b/chrome/views/client_view.cc @@ -22,12 +22,12 @@ int ClientView::NonClientHitTest(const gfx::Point& point) { /////////////////////////////////////////////////////////////////////////////// // ClientView, View overrides: -void ClientView::GetPreferredSize(CSize* out) { - DCHECK(out); +gfx::Size ClientView::GetPreferredSize() { // |contents_view_| is allowed to be NULL up until the point where this view // is attached to a ViewContainer. if (contents_view_) - contents_view_->GetPreferredSize(out); + return contents_view_->GetPreferredSize(); + return gfx::Size(); } void ClientView::ViewHierarchyChanged(bool is_add, View* parent, View* child) { |