Convert GetPreferredSize from:...

chrome/browser/views/options/languages_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/languages_page_view.h"
 
@@ skipping 211 matching lines @@
   virtual bool IsModal() const { return true; }
   virtual ChromeViews::View* GetContentsView() { return this; }
 
   // ChromeViews::ComboBox::Listener implementation:
   virtual void ItemChanged(ChromeViews::ComboBox* combo_box,
                            int prev_index,
                            int new_index);
 
   // ChromeViews::View overrides.
   virtual void Layout();
-  virtual void GetPreferredSize(CSize *out);
+  virtual gfx::Size GetPreferredSize();
 
  protected:
   virtual void ViewHierarchyChanged(bool is_add, ChromeViews::View* parent,
                                     ChromeViews::View* child);
 
  private:
   void Init();
 
   // The Options dialog window.
   ChromeViews::Window* container_;
@@ skipping 40 matching lines @@
 }
 
 void AddLanguageWindowView::ItemChanged(ChromeViews::ComboBox* combo_box,
                                   int prev_index,
                                   int new_index) {
   accept_language_selected_ = accept_language_combobox_model_->
       GetLocaleFromIndex(new_index);
 }
 
 void AddLanguageWindowView::Layout() {
-  CSize sz;
-  accept_language_combobox_->GetPreferredSize(&sz);
+  gfx::Size sz = accept_language_combobox_->GetPreferredSize();
   accept_language_combobox_->SetBounds(kDialogPadding, kDialogPadding,
-                                       width() - 2*kDialogPadding, sz.cy);
+                                       width() - 2*kDialogPadding,
+                                       sz.height());
 }
 
-void AddLanguageWindowView::GetPreferredSize(CSize* out) {
-  DCHECK(out);
+gfx::Size AddLanguageWindowView::GetPreferredSize() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   ChromeFont font = rb.GetFont(ResourceBundle::BaseFont);
-  out->cx = font.ave_char_width() * kDefaultWindowWidthChars;
-  out->cy = font.height() * kDefaultWindowHeightLines;
+  return gfx::Size(font.ave_char_width() * kDefaultWindowWidthChars,
+                   font.height() * kDefaultWindowHeightLines);
 }
 
 void AddLanguageWindowView::ViewHierarchyChanged(
     bool is_add, ChromeViews::View* parent, ChromeViews::View* child) {
   // Can't init before we're inserted into a ViewContainer, because we require
   // a HWND to parent native child controls to.
   if (is_add && child == this)
     Init();
 }
 
@@ skipping 431 matching lines @@
   language_order_table_->Select(item_selected - 1);
 
   OnSelectionChanged();
 }
 
 void LanguagesPageView::SaveChanges() {
   if (language_order_table_model_.get() && language_table_edited_)
     accept_languages_.SetValue(language_order_table_model_->GetLanguageList());
 }