Convert GetPreferredSize from:...

chrome/views/text_field.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/text_field.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlctrls.h>
@@ skipping 832 matching lines @@
     GetLocalBounds(&lb, true);
     native_view_->SetBounds(0, 0, lb.Width(), lb.Height());
     native_view_->UpdateHWNDBounds();
   }
 }
 
 void TextField::DidChangeBounds(const CRect& previous, const CRect& current) {
   Layout();
 }
 
-void TextField::GetPreferredSize(CSize *out) {
+gfx::Size TextField::GetPreferredSize() {
   gfx::Insets insets;
   CalculateInsets(&insets);
-  out->cx = default_width_in_chars_ * font_.ave_char_width() + insets.width();
-  out->cy = num_lines_ * font_.height() + insets.height();
+  return gfx::Size(default_width_in_chars_ * font_.ave_char_width() +
+                       insets.width(),
+                   num_lines_ * font_.height() + insets.height());
 }
 
 std::wstring TextField::GetText() const {
   return text_;
 }
 
 void TextField::SetText(const std::wstring& text) {
   text_ = text;
   if (edit_)
     edit_->SetText(text);
@@ skipping 128 matching lines @@
 // entering special characters.
 bool TextField::ShouldLookupAccelerators(const KeyEvent& e) {
   if (!e.IsAltDown())
     return true;
 
   return !win_util::IsNumPadDigit(e.GetCharacter(), e.IsExtendedKey());
 }
 
 }  // namespace ChromeViews