Convert GetPreferredSize from:...

chrome/browser/views/first_run_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 "chrome/browser/views/first_run_view.h"
 
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/first_run.h"
@@ skipping 76 matching lines @@
   actions_shorcuts_ = new Label(AddBullet(label2));
   actions_shorcuts_->SetHorizontalAlignment(Label::ALIGN_LEFT);
   actions_shorcuts_->SetMultiLine(true);
   AddChildView(actions_shorcuts_);
 
   customize_link_ = new Link(l10n_util::GetString(IDS_FIRSTRUN_DLG_OVERRIDE));
   customize_link_->SetController(this);
   AddChildView(customize_link_);
 }
 
-void FirstRunView::GetPreferredSize(CSize *out) {
-  DCHECK(out);
-  *out = ChromeViews::Window::GetLocalizedContentsSize(
+gfx::Size FirstRunView::GetPreferredSize() {
+  return gfx::Size(ChromeViews::Window::GetLocalizedContentsSize(
       IDS_FIRSTRUN_DIALOG_WIDTH_CHARS,
-      IDS_FIRSTRUN_DIALOG_HEIGHT_LINES).ToSIZE();
+      IDS_FIRSTRUN_DIALOG_HEIGHT_LINES));
 }
 
 void FirstRunView::Layout() {
   FirstRunViewBase::Layout();
 
   const int kVertSpacing = 8;
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
-  CSize pref_size;
-  welcome_label_->GetPreferredSize(&pref_size);
+  gfx::Size pref_size = welcome_label_->GetPreferredSize();
   // Wrap the label text before we overlap the product icon.
   int label_width = background_image()->width() -
       rb.GetBitmapNamed(IDR_WIZARD_ICON)->width() - kPanelHorizMargin;
   welcome_label_->SetBounds(kPanelHorizMargin, kPanelVertMargin,
-                            label_width, pref_size.cy);
+                            label_width, pref_size.height());
   AdjustDialogWidth(welcome_label_);
 
   int next_v_space = background_image()->y() +
                      background_image()->height() + kPanelVertMargin;
 
-  actions_label_->GetPreferredSize(&pref_size);
+  pref_size = actions_label_->GetPreferredSize();
   actions_label_->SetBounds(kPanelHorizMargin, next_v_space,
-                            pref_size.cx, pref_size.cy);
+                            pref_size.width(), pref_size.height());
   AdjustDialogWidth(actions_label_);
 
   next_v_space = actions_label_->y() +
                  actions_label_->height() + kVertSpacing;
 
   label_width = width() - (2 * kPanelHorizMargin);
   int label_height = actions_import_->GetHeightForWidth(label_width);
   actions_import_->SetBounds(kPanelHorizMargin, next_v_space, label_width,
                              label_height);
 
   next_v_space = actions_import_->y() +
                  actions_import_->height() + kVertSpacing;
   AdjustDialogWidth(actions_import_);
 
   label_height = actions_shorcuts_->GetHeightForWidth(label_width);
   actions_shorcuts_->SetBounds(kPanelHorizMargin, next_v_space, label_width,
                                label_height);
   AdjustDialogWidth(actions_shorcuts_);
 
   next_v_space = actions_shorcuts_->y() +
                  actions_shorcuts_->height() +
                  kUnrelatedControlVerticalSpacing;
 
-  customize_link_->GetPreferredSize(&pref_size);
+  pref_size = customize_link_->GetPreferredSize();
   customize_link_->SetBounds(kPanelHorizMargin, next_v_space,
-                             pref_size.cx, pref_size.cy);
+                             pref_size.width(), pref_size.height());
 }
 
 void FirstRunView::OpenCustomizeDialog() {
   // The customize dialog now owns the importer host object.
   ChromeViews::Window::CreateChromeWindow(
       window()->GetHWND(),
       gfx::Rect(),
       new FirstRunCustomizeView(profile_,
                                 importer_host_,
                                 this,
@@ skipping 39 matching lines @@
 // the work is done there we got nothing else to do.
 void FirstRunView::CustomizeAccepted() {
   window()->Close();
 }
 
 // Notification from the customize dialog that the user cancelled.
 void FirstRunView::CustomizeCanceled() {
   UserMetrics::RecordAction(L"FirstRunCustom_Cancel", profile_);
 }