Convert GetPreferredSize from:...

chrome/browser/views/info_bar_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/info_bar_view.h"
 
 #include "base/logging.h"
 #include "chrome/browser/navigation_controller.h"
 #include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/tab_contents_delegate.h"
@@ skipping 37 matching lines @@
   // AddChildView adds an entry to expire_map_ for view.
   AddChildView(view);
   if (auto_expire)
     expire_map_[view] = GetActiveID();
   else
     expire_map_.erase(expire_map_.find(view));
 }
 
 // Preferred size is equal to the max of the childrens horizontal sizes
 // and the sum of their vertical sizes.
-void InfoBarView::GetPreferredSize(CSize *out) {
-  out->cx = 0;
-  out->cy = 0;
+gfx::Size InfoBarView::GetPreferredSize() {
+  gfx::Size prefsize;
 
   // We count backwards so the most recently added view is on the top.
   for (int i = GetChildViewCount() - 1; i >= 0; i--) {
     View* v = GetChildViewAt(i);
     if (v->IsVisible()) {
-      CSize view_size;
-      v->GetPreferredSize(&view_size);
-      out->cx = std::max(static_cast<int>(out->cx), v->width());
-      out->cy += static_cast<int>(view_size.cy) + kSeparatorHeight;
+      prefsize.set_width(std::max(prefsize.width(), v->width()));
+      prefsize.Enlarge(0, v->GetPreferredSize().height() + kSeparatorHeight);
     }
   }
+  
+  return prefsize;
 }
 
 void InfoBarView::Layout() {
   int x = 0;
   int y = height();
 
   // We lay the bars out from bottom to top.
   for (int i = 0; i < GetChildViewCount(); ++i) {
     View* v = GetChildViewAt(i);
     if (!v->IsVisible())
       continue;
 
-    CSize view_size;
-    v->GetPreferredSize(&view_size);
-    int view_width = std::max(static_cast<int>(view_size.cx), width());
-    y = y - view_size.cy - kSeparatorHeight;
-    v->SetBounds(x,
-                 y,
-                 view_width,
-                 view_size.cy);
+    gfx::Size view_size = v->GetPreferredSize();
+    int view_width = std::max(view_size.width(), width());
+    y = y - view_size.height() - kSeparatorHeight;
+    v->SetBounds(x, y, view_width, view_size.height());
   }
 }
 
 void InfoBarView::Paint(ChromeCanvas* canvas) {
   PaintBackground(canvas);
   PaintBorder(canvas);
   PaintSeparators(canvas);
 }
 
 void InfoBarView::DidChangeBounds(const CRect& previous,
@@ skipping 132 matching lines @@
   }
 
   if (GetChildViewCount() == 0) {
     // All our views have been removed, no need to stay visible.
     web_contents_->view()->SetInfoBarVisible(false);
   } else if (web_contents_) {
     // This triggers a layout.
     web_contents_->ToolbarSizeChanged(false);
   }
 }