Convert GetPreferredSize from:...

chrome/views/dialog_client_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 <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 
 #include "chrome/views/dialog_client_view.h"
 
@@ skipping 220 matching lines @@
     ClientView::ViewHierarchyChanged(is_add, parent, child);
     UpdateDialogButtons();
     Layout();
   }
 }
 
 void DialogClientView::DidChangeBounds(const CRect& prev, const CRect& next) {
   Layout();
 }
 
-void DialogClientView::GetPreferredSize(CSize* out) {
-  DCHECK(out);
-  contents_view()->GetPreferredSize(out);
+gfx::Size DialogClientView::GetPreferredSize() {
+  gfx::Size prefsize = contents_view()->GetPreferredSize();
   int button_height = 0;
   if (has_dialog_buttons()) {
     if (cancel_button_)
       button_height = cancel_button_->height();
     else
       button_height = ok_button_->height();
     // Account for padding above and below the button.
     button_height += kDialogButtonContentSpacing + kButtonVEdgeMargin;
   }
-  out->cy += button_height;
+  prefsize.Enlarge(0, button_height);
+  return prefsize;
 }
 
 bool DialogClientView::AcceleratorPressed(const Accelerator& accelerator) {
   DCHECK(accelerator.GetKeyCode() == VK_ESCAPE);  // We only expect Escape key.
   window()->Close();
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogClientView, NativeButton::Listener implementation:
@@ skipping 49 matching lines @@
     if (cancel_button_)
       return cancel_button_->height() + kDialogButtonContentSpacing;
     return ok_button_->height() + kDialogButtonContentSpacing;
   }
   return 0;
 }
 
 void DialogClientView::LayoutDialogButtons() {
   CRect extra_bounds;
   if (cancel_button_) {
-    CSize ps;
-    cancel_button_->GetPreferredSize(&ps);
+    gfx::Size ps = cancel_button_->GetPreferredSize();
     CRect lb;
     GetLocalBounds(&lb, false);
     int button_width = GetButtonWidth(DialogDelegate::DIALOGBUTTON_CANCEL);
     CRect bounds;
     bounds.left = lb.right - button_width - kButtonHEdgeMargin;
-    bounds.top = lb.bottom - ps.cy - kButtonVEdgeMargin;
+    bounds.top = lb.bottom - ps.height() - kButtonVEdgeMargin;
     bounds.right = bounds.left + button_width;
-    bounds.bottom = bounds.top + ps.cy;
+    bounds.bottom = bounds.top + ps.height();
     cancel_button_->SetBounds(bounds);
     // The extra view bounds are dependent on this button.
     extra_bounds.right = bounds.left;
     extra_bounds.top = bounds.top;
   }
   if (ok_button_) {
-    CSize ps;
-    ok_button_->GetPreferredSize(&ps);
+    gfx::Size ps = ok_button_->GetPreferredSize();
     CRect lb;
     GetLocalBounds(&lb, false);
     int button_width = GetButtonWidth(DialogDelegate::DIALOGBUTTON_OK);
     int ok_button_right = lb.right - kButtonHEdgeMargin;
     if (cancel_button_)
       ok_button_right = cancel_button_->x() - kRelatedButtonHSpacing;
     CRect bounds;
     bounds.left = ok_button_right - button_width;
-    bounds.top = lb.bottom - ps.cy - kButtonVEdgeMargin;
+    bounds.top = lb.bottom - ps.height() - kButtonVEdgeMargin;
     bounds.right = ok_button_right;
-    bounds.bottom = bounds.top + ps.cy;
+    bounds.bottom = bounds.top + ps.height();
     ok_button_->SetBounds(bounds);
     // The extra view bounds are dependent on this button.
     extra_bounds.right = bounds.left;
     extra_bounds.top = bounds.top;
   }
   if (extra_view_) {
-    CSize ps;
-    extra_view_->GetPreferredSize(&ps);
+    gfx::Size ps = extra_view_->GetPreferredSize();
     CRect lb;
     GetLocalBounds(&lb, false);
     extra_bounds.left = lb.left + kButtonHEdgeMargin;
-    extra_bounds.bottom = extra_bounds.top + ps.cy;
+    extra_bounds.bottom = extra_bounds.top + ps.height();
     extra_view_->SetBounds(extra_bounds);
   }
 }
 
 void DialogClientView::LayoutContentsView() {
   CRect lb;
   GetLocalBounds(&lb, false);
   lb.bottom = std::max(0, static_cast<int>(lb.bottom - GetButtonsHeight()));
   contents_view()->SetBounds(lb);
   contents_view()->Layout();
@@ skipping 10 matching lines @@
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     dialog_button_font_ = rb.GetFont(ResourceBundle::BaseFont);
     initialized = true;
   }
 }
 
 }