Convert GetPreferredSize from:...

chrome/views/grid_layout.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/grid_layout.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "chrome/views/view.h"
@@ skipping 553 matching lines @@
 
 int ColumnSet::GetColumnWidth(int start_col, int col_span) {
   return LayoutElement::TotalSize(start_col, col_span, &columns_);
 }
 
 void ColumnSet::ResetColumnXCoordinates() {
   LayoutElement::CalculateLocationsFromSize(&columns_);
 }
 
 void ColumnSet::CalculateSize() {
-  CSize pref;
+  gfx::Size pref;
   // Reset the preferred and remaining sizes.
   for (std::vector<ViewState*>::iterator i = view_states_.begin();
        i != view_states_.end(); ++i) {
     ViewState* view_state = *i;
-    pref.cx = pref.cy = 0;
     if (!view_state->pref_width_fixed || !view_state->pref_height_fixed) {
-      view_state->view->GetPreferredSize(&pref);
+      pref = view_state->view->GetPreferredSize();
       if (!view_state->pref_width_fixed)
-        view_state->pref_width = pref.cx;
+        view_state->pref_width = pref.width();
       if (!view_state->pref_height_fixed)
-        view_state->pref_height = pref.cy;
+        view_state->pref_height = pref.height();
     }
-    view_state->remaining_width = pref.cx;
-    view_state->remaining_height = pref.cy;
+    view_state->remaining_width = pref.width();
+    view_state->remaining_height = pref.height();
   }
 
   // Let layout element reset the sizes for us.
   LayoutElement::ResetSizes(&columns_);
 
   // Distribute the size of each view with a col span == 1.
   std::vector<ViewState*>::iterator view_state_iterator =
       view_states_.begin();
   for (; view_state_iterator != view_states_.end() &&
          (*view_state_iterator)->col_span == 1; ++view_state_iterator) {
@@ skipping 183 matching lines @@
                   &x, &width);
     int y = rows_[view_state->start_row]->Location() + top_inset_;
     int height = LayoutElement::TotalSize(view_state->start_row,
                                           view_state->row_span, &rows_);
     CalculateSize(view_state->pref_height, view_state->v_align,
                   &y, &height);
     view->SetBounds(x, y, width, height);
   }
 }
 
-void GridLayout::GetPreferredSize(View* host, CSize* out) {
+gfx::Size GridLayout::GetPreferredSize(View* host) {
   DCHECK(host_ == host);
-  SizeRowsAndColumns(false, 0, 0, out);
+  CSize out;
+  SizeRowsAndColumns(false, 0, 0, &out);
+  return gfx::Size(out.cx, out.cy);
 }
 
 int GridLayout::GetPreferredHeightForWidth(View* host, int width) {
   DCHECK(host_ == host);
   CSize pref;
   SizeRowsAndColumns(false, width, 0, &pref);
   return pref.cy;
 }
 
 void GridLayout::SizeRowsAndColumns(bool layout, int width, int height,
@@ skipping 199 matching lines @@
 ColumnSet* GridLayout::GetLastValidColumnSet() {
   for (int i = current_row_ - 1; i >= 0; --i) {
     if (rows_[i]->column_set())
       return rows_[i]->column_set();
   }
   return NULL;
 }
 
 } // namespace