Convert GetPreferredSize from:...

chrome/views/radio_button.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/radio_button.h"
 
 #include "chrome/views/label.h"
 #include "chrome/views/hwnd_view.h"
 #include "chrome/views/root_view.h"
 
@@ skipping 42 matching lines @@
 // static
 int RadioButton::GetTextIndent() {
   return kRadioWidth + kRadioToLabel + kFocusPaddingHorizontal;
 }
 
 
 std::string RadioButton::GetClassName() const {
   return kViewClassName;
 }
 
-void RadioButton::GetPreferredSize(CSize *out) {
-  label_->GetPreferredSize(out);
-  out->cy = std::max(static_cast<int>(out->cy + kFocusPaddingVertical * 2),
-                     kRadioHeight) ;
-  out->cx += kRadioToLabel + kRadioWidth + kFocusPaddingHorizontal * 2;
+gfx::Size RadioButton::GetPreferredSize() {
+  gfx::Size prefsize = label_->GetPreferredSize();
+  prefsize.set_height(std::max(prefsize.height() + kFocusPaddingVertical * 2,
+                               kRadioHeight));
+  prefsize.Enlarge(kRadioToLabel + kRadioWidth + kFocusPaddingHorizontal * 2,
+                   0);
+  return prefsize;
 }
 
 void RadioButton::Layout() {
   int label_x = GetTextIndent();
   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 - kRadioHeight) / 2) + 1,
                           kRadioWidth, kRadioHeight);
     hwnd_view_->UpdateHWNDBounds();
@@ skipping 35 matching lines @@
        iter != views.end(); ++iter) {
     RadioButton* radio_button = static_cast<RadioButton*>(*iter);
     if (radio_button->IsSelected())
       return radio_button;
   }
   return NULL;
 }
 
 }