Convert GetPreferredSize from:...

chrome/views/combo_box.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/combo_box.h"
 
 #include "base/gfx/native_theme.h"
 #include "base/gfx/rect.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
@@ skipping 12 matching lines @@
     : model_(model), selected_item_(0), listener_(NULL), content_width_(0) {
 }
 
 ComboBox::~ComboBox() {
 }
 
 void ComboBox::SetListener(Listener* listener) {
   listener_ = listener;
 }
 
-void ComboBox::GetPreferredSize(CSize* out) {
+gfx::Size ComboBox::GetPreferredSize() {
   HWND hwnd = GetNativeControlHWND();
   if (!hwnd)
-    return;
+    return gfx::Size();
 
   COMBOBOXINFO cbi;
   memset(reinterpret_cast<unsigned char*>(&cbi), 0, sizeof(cbi));
   cbi.cbSize = sizeof(cbi);
   ::SendMessage(hwnd, CB_GETCOMBOBOXINFO, 0, reinterpret_cast<LPARAM>(&cbi));
   gfx::Rect rect_item(cbi.rcItem);
   gfx::Rect rect_button(cbi.rcButton);
   gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize(
       gfx::NativeTheme::MENULIST);
 
   // The padding value of '3' is the xy offset from the corner of the control
   // to the corner of rcItem.  It does not seem to be queryable from the theme.
   // It is consistent on all versions of Windows from 2K to Vista, and is
   // invariant with respect to the combobox border size.  We could conceivably
   // get this number from rect_item.x, but it seems fragile to depend on position
   // here, inside of the layout code.
   const int kItemOffset = 3;
   int item_to_button_distance = std::max(kItemOffset - border.width(), 0);
 
   // The cx computation can be read as measuring from left to right.
-  out->cx = std::max(kItemOffset + content_width_ + kComboboxExtraPaddingX +
-                     item_to_button_distance + rect_button.width() +
-                     border.width(), kMinComboboxWidth);
+  int pref_width = std::max(kItemOffset + content_width_ +
+                                kComboboxExtraPaddingX +
+                                item_to_button_distance + rect_button.width() +
+                                 border.width(), kMinComboboxWidth);
   // The two arguments to ::max below should be typically be equal.
-  out->cy = std::max(rect_item.height() + 2 * kItemOffset,
-                     rect_button.height() + 2 * border.height());
+  int pref_height = std::max(rect_item.height() + 2 * kItemOffset,
+                             rect_button.height() + 2 * border.height());
+  return gfx::Size(pref_width, pref_height);
 }
 
 HWND ComboBox::CreateNativeControl(HWND parent_container) {
   HWND r = ::CreateWindowEx(GetAdditionalExStyle(), L"COMBOBOX", L"",
                             WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST,
                             0, 0, width(), height(),
                             parent_container, NULL, NULL, NULL);
   HFONT font = ResourceBundle::GetSharedInstance().
       GetFont(ResourceBundle::BaseFont).hfont();
   SendMessage(r, WM_SETFONT, reinterpret_cast<WPARAM>(font), FALSE);
@@ skipping 79 matching lines @@
   // ComboBox::Model can be safely searched for and selected (which is what
   // CB_SELECTSTRING does).
   ::SendMessage(hwnd, CB_SETCURSEL, selected_item_, 0);
 }
 
 int ComboBox::GetSelectedItem() {
   return selected_item_;
 }
 }