Convert GetPreferredSize from:...

chrome/browser/views/old_frames/simple_xp_frame.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/old_frames/simple_xp_frame.h"
 
 #include "chrome/app/theme/theme_resources.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
@@ skipping 61 matching lines @@
   drop_arrow_ = rb.GetBitmapNamed(IDR_APP_DROPARROW);
 }
 
 TitleBarMenuButton::~TitleBarMenuButton() {
 }
 
 void TitleBarMenuButton::SetContents(ChromeViews::View* contents) {
   contents_ = contents;
 }
 
-void TitleBarMenuButton::GetPreferredSize(CSize *out) {
+gfx::Size TitleBarMenuButton::GetPreferredSize() {
+  gfx::Size prefsize;
   if (contents_)
-    contents_->GetPreferredSize(out);
-  else
-    out->cx = out->cy = 0;
+    prefsize = contents_->GetPreferredSize();
 
-  out->cx += drop_arrow_->width() + kHorizMargin + (2 * kHorizBorderSize);
-  out->cy = std::max(drop_arrow_->height(), static_cast<int>(out->cy));
-  out->cy += (2 * kVertBorderSize);
+  prefsize.set_height(std::max(drop_arrow_->height(), prefsize.height()));
+  prefsize.Enlarge(
+      drop_arrow_->width() + kHorizMargin + (2 * kHorizBorderSize),
+      2 * kVertBorderSize);
+  return prefsize;
 }
 
 void TitleBarMenuButton::Paint(ChromeCanvas* canvas) {
   if (GetState() == TextButton::BS_HOT ||
       GetState() == TextButton::BS_PUSHED || menu_visible_) {
     canvas->FillRectInt(kHotColor, 0, 0, width(), height());
   }
 
   if (contents_) {
-    CSize s;
-    contents_->GetPreferredSize(&s);
+    gfx::Size s = contents_->GetPreferredSize();
     // Note: we use a floating view in this case because we never want the
     // contents to process any event.
     PaintFloatingView(canvas,
                       contents_,
                       kVertBorderSize,
-                      (height() - s.cy) / 2,
+                      (height() - s.height()) / 2,
                       width() - kHorizMargin - drop_arrow_->width() -
                       (2 * kHorizBorderSize),
-                      s.cy);
+                      s.height());
   }
 
   // We can not use the mirroring infrastructure in ChromeViews in order to
   // mirror the drop down arrow because is is drawn directly on the canvas
   // (instead of using a child View). Thus, we should mirror its position
   // manually.
   gfx::Rect arrow_bounds(width() - drop_arrow_->width() - kHorizBorderSize,
                          (height() - drop_arrow_->height()) / 2,
                          drop_arrow_->width(),
                          drop_arrow_->height());
@@ skipping 77 matching lines @@
   gfx::Point p(menu_button_->GetX(APPLY_MIRRORING_TRANSFORMATION),
                menu_button_->y() + menu_button_->height());
 
   if (UILayoutIsRightToLeft())
     p.set_x(p.x() + menu_button_->width());
   View::ConvertPointToScreen(this, &p);
   parent_->RunMenu(p.ToPOINT(), hwnd);
 }
 
 void SimpleXPFrameTitleBar::Layout() {
-  CSize s;
-  menu_button_->GetPreferredSize(&s);
-  menu_button_->SetBounds(kFavIconMargin, (height() - s.cy) / 2,
-                          s.cx, s.cy);
+  gfx::Size s = menu_button_->GetPreferredSize();
+  menu_button_->SetBounds(kFavIconMargin, (height() - s.height()) / 2,
+                          s.width(), s.height());
   menu_button_->Layout();
   label_->SetBounds(menu_button_->x() + menu_button_->width() +
                     kFavIconPadding, kLabelVerticalOffset,
                     width() - (menu_button_->x() +
                                   menu_button_->width() + kFavIconPadding),
                     height());
 }
 
 bool SimpleXPFrameTitleBar::WillHandleMouseEvent(int x, int y) {
   // If the locale is RTL, we must query for the bounds of the menu button in
@@ skipping 93 matching lines @@
     TabContentsContainerView* tccv = GetTabContentsContainer();
     DCHECK(tccv);
     title_bar_->SetBounds(tccv->x(), 0,
                           GetButtonXOrigin() - tccv->x(),
                           GetContentsYOrigin());
     title_bar_->Layout();
   }
 
   if (browser_->ShouldDisplayURLField()) {
     TabContentsContainerView* container = GetTabContentsContainer();
-    CSize s;
-    location_bar_->GetPreferredSize(&s);
+    gfx::Size s = location_bar_->GetPreferredSize();
     location_bar_->SetBounds(container->x() - kLocationBarOffset,
                           container->y(),
                           container->width() + kLocationBarOffset * 2,
-                          s.cy);
+                          s.height());
     container->SetBounds(container->x(),
                          location_bar_->y() + location_bar_->height() +
                          kLocationBarSpacing, container->width(),
                          container->height() - location_bar_->height() -
                          1);
     location_bar_->SetVisible(true);
     location_bar_->Layout();
   } else {
     location_bar_->SetVisible(false);
   }
@@ skipping 53 matching lines @@
     location_bar_->Update(NULL);
 }
 
 TabContents* SimpleXPFrame::GetTabContents() {
   return GetCurrentContents();
 }
 
 void SimpleXPFrame::OnInputInProgress(bool in_progress) {
 }