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, 18 insertions, 21 deletions

diff --git a/chrome/views/decision.cc b/chrome/views/decision.cc
index a6d4f38..e6c57b4 100644
--- a/chrome/views/decision.cc
+++ b/chrome/views/decision.cc
@@ -80,50 +80,47 @@ void Decision::Layout() {
   int width = lb.Width();
 
   CPoint position(lb.TopLeft());
-  CSize size;
-  title_label_->GetPreferredSize(&size);
-  title_label_->SetBounds(position.x, position.y, width, size.cy);
-  position.y += size.cy + kSpacingInfoBottom;
+  gfx::Size size = title_label_->GetPreferredSize();
+  title_label_->SetBounds(position.x, position.y, width, size.height());
+  position.y += size.height() + kSpacingInfoBottom;
 
-  size.cy = details_label_->GetHeightForWidth(width);
-  details_label_->SetBounds(position.x, position.y, width, size.cy);
-  position.y += size.cy + kSpacingInfoBottom;
+  size.set_height(details_label_->GetHeightForWidth(width));
+  details_label_->SetBounds(position.x, position.y, width, size.height());
+  position.y += size.height() + kSpacingInfoBottom;
 
   for (std::vector<Option*>::const_iterator iter = options_.begin();
        iter != options_.end(); ++iter) {
     Option* option = *iter;
-    option->GetPreferredSize(&size);
-    option->SetBounds(position.x, position.y, width, size.cy);
+    size = option->GetPreferredSize();
+    option->SetBounds(position.x, position.y, width, size.height());
     option->Layout();
-    position.y += size.cy + kSpacingInfoBottom;
+    position.y += size.height() + kSpacingInfoBottom;
   }
 }
 
-void Decision::GetPreferredSize(CSize *out) {
+gfx::Size Decision::GetPreferredSize() {
   int width = 0;
   int height = 0;
 
   // We need to find the largest width from the title and the options, as the
   // details label is multi-line and we need to known its width in order to
   // compute its height.
-  CSize size;
-  title_label_->GetPreferredSize(&size);
-  width = size.cx;
-  height = size.cy + kSpacingInfoBottom;
+  gfx::Size size = title_label_->GetPreferredSize();
+  width = size.width();
+  height = size.height() + kSpacingInfoBottom;
 
   for (std::vector<Option*>::const_iterator iter = options_.begin();
        iter != options_.end(); ++iter) {
-    (*iter)->GetPreferredSize(&size);
-    if (size.cx > width)
-      width = size.cx;
-    height += size.cy + kSpacingInfoBottom;
+    size = (*iter)->GetPreferredSize();
+    if (size.width() > width)
+      width = size.width();
+    height += size.height() + kSpacingInfoBottom;
   }
 
   // Now we can compute the details label height.
   height += details_label_->GetHeightForWidth(width) + kSpacingInfoBottom;
 
-  out->cx = width + 2 * kPaddingEdge;
-  out->cy = height + 2 * kPaddingEdge;
+  return gfx::Size(width + 2 * kPaddingEdge, height + 2 * kPaddingEdge);
 }
 
 Option::Option(int command_id,