Convert GetPreferredSize from:...

chrome/browser/views/options/fonts_page_view.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 <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "chrome/browser/views/options/fonts_page_view.h"
 
@@ skipping 79 matching lines @@
                    int font_size);
 
   void SetFontType(ChromeFont font);
 
   std::wstring font_name() { return font_name_; }
   int font_size() { return font_size_; }
 
   // ChromeViews::View overrides:
   virtual void Paint(ChromeCanvas* canvas);
   virtual void Layout();
-  virtual void GetPreferredSize(CSize* out);
+  virtual gfx::Size GetPreferredSize();
 
  private:
   ChromeViews::Label* font_text_label_;
   std::wstring font_name_;
   int font_size_;
   std::wstring font_text_label_string_;
 
   static const int kFontDisplayMaxWidthChars = 50;
   static const int kFontDisplayMaxHeightChars = 1;
   static const int kFontDisplayLabelPadding = 5;
@@ skipping 51 matching lines @@
   gfx::NativeTheme::instance()->PaintTextField(
       dc, EP_BACKGROUND, EBS_NORMAL, 0, &rect, ::GetSysColor(COLOR_3DFACE),
       true, true);
   canvas->endPlatformPaint();
 }
 
 void FontDisplayView::Layout() {
   font_text_label_->SetBounds(0, 0, width(), height());
 }
 
-void FontDisplayView::GetPreferredSize(CSize* out) {
-  DCHECK(out);
+gfx::Size FontDisplayView::GetPreferredSize() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   ChromeFont font = rb.GetFont(ResourceBundle::BaseFont);
-  out->cx = font.ave_char_width() * kFontDisplayMaxWidthChars;
-  out->cy = font.height() * kFontDisplayMaxHeightChars
-      + 2 * kFontDisplayLabelPadding;
+  return gfx::Size(font.ave_char_width() * kFontDisplayMaxWidthChars,
+                   font.height() * kFontDisplayMaxHeightChars
+                       + 2 * kFontDisplayLabelPadding);
 }
 
 void EmbellishTitle(ChromeViews::Label* title_label) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   ChromeFont title_font =
       rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, ChromeFont::BOLD);
   title_label->SetFont(title_font);
   SkColor title_color =
       gfx::NativeTheme::instance()->GetThemeColorWithDefault(
           gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR,
@@ skipping 287 matching lines @@
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   // Add Encoding ComboBox.
   layout->StartRow(0, double_column_view_set_id);
   layout->AddView(default_encoding_combobox_label_);
   layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL,
       GridLayout::CENTER);
 }