Convert GetPreferredSize from:...

chrome/browser/views/password_manager_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 "base/string_util.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/password_manager_view.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
@@ skipping 18 matching lines @@
 // MultiLabelButtons
 //
 MultiLabelButtons::MultiLabelButtons(const std::wstring& label,
                                      const std::wstring& alt_label)
     : NativeButton(label),
       label_(label),
       alt_label_(alt_label),
       pref_size_(-1, -1) {
 }
 
-void MultiLabelButtons::GetPreferredSize(CSize *out) {
-  if (pref_size_.cx == -1 && pref_size_.cy == -1) {
+gfx::Size MultiLabelButtons::GetPreferredSize() {
+  if (pref_size_.width() == -1 && pref_size_.height() == -1) {
     // Let's compute our preferred size.
     std::wstring current_label = GetLabel();
     SetLabel(label_);
-    NativeButton::GetPreferredSize(&pref_size_);
+    pref_size_ = NativeButton::GetPreferredSize();
     SetLabel(alt_label_);
-    CSize alt_pref_size;
-    NativeButton::GetPreferredSize(&alt_pref_size);
+    gfx::Size alt_pref_size = NativeButton::GetPreferredSize();
     // Revert to the original label.
     SetLabel(current_label);
-    pref_size_.cx = std::max(pref_size_.cx, alt_pref_size.cx);
-    pref_size_.cy = std::max(pref_size_.cy, alt_pref_size.cy);
+    pref_size_.SetSize(std::max(pref_size_.width(), alt_pref_size.width()),
+                       std::max(pref_size_.height(), alt_pref_size.height()));
   }
-  *out = pref_size_;
+  return gfx::Size(pref_size_.width(), pref_size_.height());
 }
 
 ////////////////////////////////////////////////////////////////////
 // PasswordManagerTableModel::PasswordRow
 PasswordManagerTableModel::PasswordRow::~PasswordRow() {
   delete form;
 }
 
 ////////////////////////////////////////////////////////////////////
 // PasswordManagerTableModel
@@ skipping 225 matching lines @@
 PasswordManagerView::~PasswordManagerView() {
 }
 
 void PasswordManagerView::Layout() {
   GetLayoutManager()->Layout(this);
 
   // Manually lay out the Remove All button in the same row as
   // the close button.
   CRect parent_bounds;
   GetParent()->GetLocalBounds(&parent_bounds, false);
-  CSize prefsize;
-  remove_all_button_.GetPreferredSize(&prefsize);
-  int button_y = parent_bounds.bottom - prefsize.cy - kButtonVEdgeMargin;
-  remove_all_button_.SetBounds(kPanelHorizMargin, button_y, prefsize.cx,
-                               prefsize.cy);
+  gfx::Size prefsize = remove_all_button_.GetPreferredSize();
+  int button_y = parent_bounds.bottom - prefsize.height() - kButtonVEdgeMargin;
+  remove_all_button_.SetBounds(kPanelHorizMargin, button_y, prefsize.width(),
+                               prefsize.height());
 }
 
-void PasswordManagerView::GetPreferredSize(CSize* out) {
-  out->cx = kDefaultWindowWidth;
-  out->cy = kDefaultWindowHeight;
+gfx::Size PasswordManagerView::GetPreferredSize() {
+  return gfx::Size(kDefaultWindowWidth, kDefaultWindowHeight);
 }
 
 void PasswordManagerView::ViewHierarchyChanged(bool is_add,
                                                ChromeViews::View* parent,
                                                ChromeViews::View* child) {
   if (child == this) {
     // Add and remove the Remove All button from the ClientView's hierarchy.
     if (is_add) {
       parent->AddChildView(&remove_all_button_);
     } else {
@@ skipping 73 matching lines @@
   table_view_->SetModel(NULL);
 
   // Clear the static instance so the next time Show() is called, a new
   // instance is created.
   instance_ = NULL;
 }
 
 ChromeViews::View* PasswordManagerView::GetContentsView() {
   return this;
 }