Convert GetPreferredSize from:...

chrome/browser/views/importing_progress_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/importing_progress_view.h"
 
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/grid_layout.h"
@@ skipping 133 matching lines @@
   importing_ = false;
   coordinator_->SetObserver(NULL);
   window()->Close();
   if (import_observer_)
     import_observer_->ImportComplete();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImportingProgressView, ChromeViews::View overrides:
 
-void ImportingProgressView::GetPreferredSize(CSize* out) {
-  DCHECK(out);
-  *out = ChromeViews::Window::GetLocalizedContentsSize(
+gfx::Size ImportingProgressView::GetPreferredSize() {
+  return gfx::Size(ChromeViews::Window::GetLocalizedContentsSize(
       IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS,
-      IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES).ToSIZE();
+      IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES));
 }
 
 void ImportingProgressView::ViewHierarchyChanged(bool is_add,
                                                  ChromeViews::View* parent,
                                                  ChromeViews::View* child) {
   if (is_add && child == this)
     InitControlLayout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 38 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ImportingProgressView, private:
 
 void ImportingProgressView::InitControlLayout() {
   using ChromeViews::GridLayout;
   using ChromeViews::ColumnSet;
 
   GridLayout* layout = CreatePanelGridLayout(this);
   SetLayoutManager(layout);
 
-  CSize ps;
-  state_history_->GetPreferredSize(&ps);
+  gfx::Size ps = state_history_->GetPreferredSize();
 
   const int single_column_view_set_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
   const int double_column_view_set_id = 1;
   column_set = layout->AddColumnSet(double_column_view_set_id);
   column_set->AddPaddingColumn(0, kUnrelatedControlLargeHorizontalSpacing);
   column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
-                        GridLayout::FIXED, ps.cx, 0);
+                        GridLayout::FIXED, ps.width(), 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kUnrelatedControlLargeHorizontalSpacing);
 
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(label_info_);
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
 
   if (items_ & FAVORITES) {
@@ skipping 41 matching lines @@
   DCHECK(items != 0);
   ImportingProgressView* v = new ImportingProgressView(
       source_profile.description, items, coordinator, observer, parent_window);
   ChromeViews::Window::CreateChromeWindow(parent_window, gfx::Rect(),
                                           v)->Show();
   coordinator->StartImportSettings(source_profile, items,
                                    new ProfileWriter(target_profile),
                                    first_run);
 }