Convert GetPreferredSize from:...

chrome/views/message_box_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/views/message_box_view.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/controller.h"
 #include "chrome/browser/views/standard_layout.h"
@@ skipping 101 matching lines @@
 }
 
 void MessageBoxView::ResetLayoutManager() {
   using ChromeViews::GridLayout;
   using ChromeViews::ColumnSet;
 
   // Initialize the Grid Layout Manager used for this dialog box.
   GridLayout* layout = CreatePanelGridLayout(this);
   SetLayoutManager(layout);
 
-  CSize icon_size;
+  gfx::Size icon_size;
   if (icon_)
-    icon_->GetPreferredSize(&icon_size);
+    icon_size = icon_->GetPreferredSize();
 
   // Add the column set for the message displayed at the top of the dialog box.
   // And an icon, if one has been set.
   const int message_column_view_set_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(message_column_view_set_id);
   if (icon_) {
     column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0,
-                          GridLayout::FIXED, icon_size.cx, icon_size.cy);
+                          GridLayout::FIXED, icon_size.width(),
+                          icon_size.height());
     column_set->AddPaddingColumn(0, kUnrelatedControlHorizontalSpacing);
   }
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::FIXED, message_width_, 0);
 
   // Column set for prompt textfield, if one has been set.
   const int textfield_column_view_set_id = 1;
   if (prompt_field_) {
     column_set = layout->AddColumnSet(textfield_column_view_set_id);
     if (icon_) {
       column_set->AddPaddingColumn(0,
-          icon_size.cx + kUnrelatedControlHorizontalSpacing);
+          icon_size.width() + kUnrelatedControlHorizontalSpacing);
     }
     column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                           GridLayout::USE_PREF, 0, 0);
   }
 
   // Column set for checkbox, if one has been set.
   const int checkbox_column_view_set_id = 2;
   if (check_box_) {
     column_set = layout->AddColumnSet(checkbox_column_view_set_id);
     if (icon_) {
       column_set->AddPaddingColumn(0,
-          icon_size.cx + kUnrelatedControlHorizontalSpacing);
+          icon_size.width() + kUnrelatedControlHorizontalSpacing);
     }
     column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                           GridLayout::USE_PREF, 0, 0);
   }
 
   layout->StartRow(0, message_column_view_set_id);
   if (icon_)
     layout->AddView(icon_);
 
   layout->AddView(message_label_);
 
   if (prompt_field_) {
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
     layout->StartRow(0, textfield_column_view_set_id);
     layout->AddView(prompt_field_);
   }
 
   if (check_box_) {
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
     layout->StartRow(0, checkbox_column_view_set_id);
     layout->AddView(check_box_);
   }
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 }