Convert GetPreferredSize from:...

chrome/views/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/button.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 
 #include "base/gfx/image_operations.h"
@@ skipping 39 matching lines @@
   images_[aState] = anImage ? *anImage : SkBitmap();
 }
 
 void Button::SetImageAlignment(HorizontalAlignment h_align,
                                VerticalAlignment v_align) {
   h_alignment_ = h_align;
   v_alignment_ = v_align;
   SchedulePaint();
 }
 
-void Button::GetPreferredSize(CSize *result) {
-  if (!images_[BS_NORMAL].isNull()) {
-    result->cx = images_[BS_NORMAL].width();
-    result->cy = images_[BS_NORMAL].height();
-  } else {
-    result->cx = kDefaultWidth;
-    result->cy = kDefaultHeight;
-  }
+gfx::Size Button::GetPreferredSize() {
+  if (!images_[BS_NORMAL].isNull())
+    return gfx::Size(images_[BS_NORMAL].width(), images_[BS_NORMAL].height());
+  return gfx::Size(kDefaultWidth, kDefaultHeight);
 }
 
 // Set the tooltip text for this button.
 void Button::SetTooltipText(const std::wstring& text) {
   tooltip_text_ = text;
   TooltipTextChanged();
 }
 
 // Return the tooltip text currently used by this button.
 std::wstring Button::GetTooltipText() const {
@@ skipping 120 matching lines @@
   }
   toggled_ = toggled;
   SchedulePaint();
 }
 
 void ToggleButton::SetToggledTooltipText(const std::wstring& tooltip) {
   toggled_tooltip_text_.assign(tooltip);
 }
 }  // namespace ChromeViews