Convert GetPreferredSize from:...

chrome/views/native_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/native_button.h"
 
 #include "base/logging.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
@@ skipping 15 matching lines @@
 }
 
 void NativeButton::SetListener(Listener *l) {
   listener_ = l;
 }
 
 void NativeButton::SetPadding(CSize size) {
   padding_ = size;
 }
 
-void NativeButton::GetPreferredSize(CSize *out) {
+gfx::Size NativeButton::GetPreferredSize() {
   HWND hwnd = GetNativeControlHWND();
   if (hwnd) {
     SIZE sz = {0, 0};
     ::SendMessage(hwnd,
                   BCM_GETIDEALSIZE,
                   0,
                   reinterpret_cast<LPARAM>(&sz));
     sz.cx += 2 * padding_.cx;
     sz.cy += 2 * padding_.cy;
 
     if (enforce_dlu_min_size_) {
       if (min_dlu_size_.width()) {
         sz.cx =
             std::max(static_cast<int>(sz.cx),
                      font_.horizontal_dlus_to_pixels(min_dlu_size_.width()));
       }
       if (min_dlu_size_.height())
         sz.cy = std::max(static_cast<int>(sz.cy),
                          font_.vertical_dlus_to_pixels(min_dlu_size_.height()));
     }
-    *out = sz;
+    return gfx::Size(sz.cx, sz.cy);
   }
+  return gfx::Size();
 }
 
 void NativeButton::SetLabel(const std::wstring& l) {
   // Even though we create a flipped HWND for a native button when the locale
   // is right-to-left, Windows does not render text for the button using a
   // right-to-left context (perhaps because the parent HWND is not flipped).
   // The result is that RTL strings containing punctuation marks are not
   // displayed properly. For example, the string "...ABC" (where A, B and C are
   // Hebrew characters) is displayed as "ABC..." which is incorrect.
   //
@@ skipping 116 matching lines @@
 
 bool NativeButton::OnKeyDown(int virtual_key_code) {
   if (virtual_key_code == VK_RETURN) {
     Clicked();
     return true;
   }
   return false;
 }
 
 }