Convert GetPreferredSize from:...

chrome/views/view.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/views/view.h"
 
 #include <algorithm>
 
 #ifndef NDEBUG
 #include <iostream>
@@ skipping 151 matching lines @@
     if (size_changed || position_changed)
       root->ViewBoundsChanged(this, size_changed, position_changed);
   }
 }
 
 void View::SetBounds(int x, int y, int width, int height) {
   CRect tmp(x, y, x + width, y + 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;
     out->top = 0;
     out->right = width();
     out->bottom = height();
   } else {
     gfx::Insets insets;
     border_->GetInsets(&insets);
     out->left = insets.left();
     out->top = insets.top();
     out->right = width() - insets.left();
     out->bottom = height() - insets.top();
   }
 }
 
 void View::GetSize(CSize* sz) const {
   sz->cx = width();
   sz->cy = height();
 }
 
 void View::GetPosition(CPoint* p) const {
   p->x = GetX(APPLY_MIRRORING_TRANSFORMATION);
   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) {
 }
 
 void View::ScrollRectToVisible(int x, int y, int width, int height) {
   View* parent = GetParent();
 
   // We must take RTL UI mirroring into account when adjusting the position of
   // the region.
@@ skipping 1450 matching lines @@
 }
 
 void View::DragInfo::PossibleDrag(int x, int y) {
   possible_drag = true;
   start_x = x;
   start_y = y;
 }
 
 }  // namespace