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, 14 insertions, 15 deletions

diff --git a/chrome/views/view.cc b/chrome/views/view.cc
index f73ca92..cbb1b25 100644
--- a/chrome/views/view.cc
+++ b/chrome/views/view.cc
@@ -169,6 +169,10 @@ void View::SetBounds(int x, int y, int width, int height) {
   SetBounds(tmp);
 }
 
+void View::SetBounds(const gfx::Point& origin, const gfx::Size& size) {
+  SetBounds(origin.x(), origin.y(), size.width(), size.height());
+}
+
 void View::GetLocalBounds(CRect* out, bool include_border) const {
   if (include_border || border_ == NULL) {
     out->left = 0;
@@ -195,32 +199,27 @@ void View::GetPosition(CPoint* p) const {
   p->y = y();
 }
 
-void View::GetPreferredSize(CSize* out) {
-  if (layout_manager_.get()) {
-    layout_manager_->GetPreferredSize(this, out);
-  } else {
-    out->cx = out->cy = 0;
-  }
+gfx::Size View::GetPreferredSize() {
+  if (layout_manager_.get())
+    return layout_manager_->GetPreferredSize(this);
+  return gfx::Size();
 }
 
 void View::SizeToPreferredSize() {
-  CSize size;
-  GetPreferredSize(&size);
-  if ((size.cx != width()) || (size.cy != height()))
-    SetBounds(x(), y(), size.cx, size.cy);
+  gfx::Size prefsize = GetPreferredSize();
+  if ((prefsize.width() != width()) || (prefsize.height() != height()))
+    SetBounds(x(), y(), prefsize.width(), prefsize.height());
 }
 
-void View::GetMinimumSize(CSize* out) {
-  GetPreferredSize(out);
+gfx::Size View::GetMinimumSize() {
+  return GetPreferredSize();
 }
 
 int View::GetHeightForWidth(int w) {
   if (layout_manager_.get())
     return layout_manager_->GetPreferredHeightForWidth(this, w);
 
-  CSize size;
-  GetPreferredSize(&size);
-  return size.cy;
+  return GetPreferredSize().height();
 }
 
 void View::DidChangeBounds(const CRect& previous, const CRect& current) {