Convert GetPreferredSize from:...

chrome/views/checkbox.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/checkbox.h"
 
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/checkbox.h"
 #include "chrome/views/hwnd_view.h"
 #include "chrome/views/label.h"
@@ skipping 53 matching lines @@
   label_->SetBounds(label_x, 0, width() - label_x, height());
   if (hwnd_view_) {
     int first_line_height = label_->GetFont().height();
     hwnd_view_->SetBounds(0, ((first_line_height - kCheckBoxHeight) / 2) + 1,
                           kCheckBoxWidth, kCheckBoxHeight);
     hwnd_view_->UpdateHWNDBounds();
   }
 }
 
 void CheckBox::ComputeTextRect(gfx::Rect* out) {
-  CSize s;
-  label_->GetPreferredSize(&s);
+  gfx::Size s = label_->GetPreferredSize();
   out->set_x(GetTextIndent());
   out->set_y(kFocusPaddingVertical);
   int new_width = std::min(width() - (kCheckBoxWidth + kCheckBoxToLabel),
-                           static_cast<int>(s.cx));
+                           s.width());
   out->set_width(std::max(0, new_width));
-  out->set_height(s.cy);
+  out->set_height(s.height());
 }
 
 void CheckBox::Paint(ChromeCanvas* canvas) {
   gfx::Rect r;
   ComputeTextRect(&r);
   // Paint the focus border if any.
   if (HasFocus())
     canvas->DrawFocusRect(r.x() - kFocusPaddingHorizontal,
                           r.y() - kFocusPaddingVertical,
                           r.width() + kFocusPaddingHorizontal * 2,
@@ skipping 20 matching lines @@
 }
 
 void CheckBox::ConfigureNativeButton(HWND hwnd) {
   ::SendMessage(hwnd,
                 static_cast<UINT>(BM_SETCHECK),
                 static_cast<WPARAM>(is_selected_ ? BST_CHECKED : BST_UNCHECKED),
                 0);
   label_->SetText(GetLabel());
 }
 
-void CheckBox::GetPreferredSize(CSize *out) {
-  label_->GetPreferredSize(out);
-  out->cy = std::max(static_cast<int>(out->cy + kFocusPaddingVertical * 2),
-                     kCheckBoxHeight);
-  out->cx += GetTextIndent() * 2;
+gfx::Size CheckBox::GetPreferredSize() {
+  gfx::Size prefsize = label_->GetPreferredSize();
+  prefsize.set_height(std::max(prefsize.height() + kFocusPaddingVertical * 2,
+                               kCheckBoxHeight));
+  prefsize.Enlarge(GetTextIndent() * 2, 0);
+  return prefsize;
 }
 
 LRESULT CheckBox::OnCommand(UINT code, int id, HWND source) {
   if (code == BN_CLICKED)
     SetIsSelected(!is_selected_);
 
   return NativeButton::OnCommand(code, id, source);
 }
 
 void CheckBox::HighlightButton(bool f) {
@@ skipping 34 matching lines @@
 
 void CheckBox::OnMouseReleased(const MouseEvent& event,
                                bool canceled) {
   HighlightButton(false);
   if (!canceled && LabelHitTest(event))
     OnCommand(BN_CLICKED, 0, GetNativeControlHWND());
 }
 
 }