Convert GetPreferredSize from:...

chrome/browser/views/page_info_window.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/page_info_window.h"
 
 #include <cryptuiapi.h>
 #pragma comment(lib, "cryptui.lib")
 
 #include "base/string_util.h"
@@ skipping 152 matching lines @@
 }
 
 SecurityTabView::Section::~Section() {
 }
 
 int SecurityTabView::Section::GetHeightForWidth(int width) {
   // The height of the section depends on the height of the description label
   // (multi-line).  We need to know the width of the description label to know
   // its height.
   int height = 0;
-  CSize size;
-  title_label_->GetPreferredSize(&size);
-  height += size.cy + kVGapTitleToImage;
+  gfx::Size size = title_label_->GetPreferredSize();
+  height += size.height() + kVGapTitleToImage;
 
-  CSize image_size;
-  status_image_->GetPreferredSize(&image_size);
+  gfx::Size image_size = status_image_->GetPreferredSize();
 
   int text_height = 0;
   if (!head_line_label_->GetText().empty()) {
-    head_line_label_->GetPreferredSize(&size);
-    text_height = size.cy + kVGapHeadLineToDescription;
+    size = head_line_label_->GetPreferredSize();
+    text_height = size.height() + kVGapHeadLineToDescription;
   }
 
-  int description_width = width - image_size.cx - kHGapImageToDescription -
-                          kHGapToBorder;
+  int description_width =
+      width - image_size.width() - kHGapImageToDescription - kHGapToBorder;
   text_height += description_label_->GetHeightForWidth(description_width);
 
-  height += std::max(static_cast<int>(image_size.cy), text_height);
+  height += std::max(image_size.height(), text_height);
 
   return height;
 }
 
 void SecurityTabView::Section::Layout() {
   // First, layout the title and separator.
   int x = 0;
   int y = 0;
-  CSize size;
-  title_label_->GetPreferredSize(&size);
-  title_label_->SetBounds(x, y, size.cx, size.cy);
-  x += size.cx + kHGapTitleToSeparator;
+  gfx::Size size = title_label_->GetPreferredSize();
+  title_label_->SetBounds(x, y, size.width(), size.height());
+  x += size.width() + kHGapTitleToSeparator;
   separator_->SetBounds(x + kHExtraSeparatorPadding, y,
-                        width() - x - 2 * kHExtraSeparatorPadding, size.cy);
+                        width() - x - 2 * kHExtraSeparatorPadding,
+                        size.height());
 
   // Then the image, head-line and description.
   x = kHGapToBorder;
   y += title_label_->height() + kVGapTitleToImage;
-  status_image_->GetPreferredSize(&size);
-  status_image_->SetBounds(x, y, size.cx, size.cy);
-  x += size.cx + kHGapImageToDescription;
+  size = status_image_->GetPreferredSize();
+  status_image_->SetBounds(x, y, size.width(), size.height());
+  x += size.width() + kHGapImageToDescription;
   int w = width() - x;
   if (!head_line_label_->GetText().empty()) {
-    head_line_label_->GetPreferredSize(&size);
-    head_line_label_->SetBounds(x, y, w > 0 ? w : 0, size.cy);
-    y += size.cy + kVGapHeadLineToDescription;
+    size = head_line_label_->GetPreferredSize();
+    head_line_label_->SetBounds(x, y, w > 0 ? w : 0, size.height());
+    y += size.height() + kVGapHeadLineToDescription;
   } else {
     head_line_label_->SetBounds(x, y, 0, 0);
   }
   if (w > 0) {
     description_label_->SetBounds(x, y, w,
                                   description_label_->GetHeightForWidth(w));
   } else {
     description_label_->SetBounds(x, y, 0, 0);
   }
 }
@@ skipping 216 matching lines @@
   // ChromeViews::View overrides:
   virtual void GetPreferredSize(CSize *out) {
     DCHECK(out);
     *out = ChromeViews::Window::GetLocalizedContentsSize(
         IDS_PAGEINFO_DIALOG_WIDTH_CHARS,
         IDS_PAGEINFO_DIALOG_HEIGHT_LINES).ToSIZE();
   }
 
   virtual void Layout() {
     if (cert_viewer_button_) {
-      CSize ps;
-      cert_viewer_button_->GetPreferredSize(&ps);
+      gfx::Size ps = cert_viewer_button_->GetPreferredSize();
 
       CRect parent_bounds;
       GetParent()->GetLocalBounds(&parent_bounds, false);
-      int y_buttons = parent_bounds.bottom - ps.cy - kButtonVEdgeMargin;
-      cert_viewer_button_->SetBounds(kPanelHorizMargin, y_buttons, ps.cx,
-                                     ps.cy);
+      int y_buttons = parent_bounds.bottom - ps.height() - kButtonVEdgeMargin;
+      cert_viewer_button_->SetBounds(kPanelHorizMargin, y_buttons, ps.width(),
+                                     ps.height());
     }
     View::Layout();
   }
 
  private:
   ChromeViews::NativeButton* cert_viewer_button_;
 
   DISALLOW_EVIL_CONSTRUCTORS(PageInfoContentView);
 };
 
@@ skipping 222 matching lines @@
   HCERTSTORE cert_store = view_info.pCertContext->hCertStore;
   view_info.cStores = 1;
   view_info.rghStores = &cert_store;
   BOOL properties_changed;
 
   // This next call blocks but keeps processing windows messages, making it
   // modal to the browser window.
   BOOL rv = ::CryptUIDlgViewCertificate(&view_info, &properties_changed);
 }