Convert GetPreferredSize from:...

chrome/browser/views/constrained_window_impl.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/constrained_window_impl.h"
 
 #include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/tab_contents.h"
@@ skipping 199 matching lines @@
   virtual gfx::Size CalculateWindowSizeForClientSize(int width,
                                                      int height) const;
   virtual CPoint GetSystemMenuPoint() const;
   virtual int NonClientHitTest(const gfx::Point& point);
   virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask);
   virtual void EnableClose(bool enable);
 
   // Overridden from ChromeViews::View:
   virtual void Paint(ChromeCanvas* canvas);
   virtual void Layout();
-  virtual void GetPreferredSize(CSize* out);
+  virtual gfx::Size GetPreferredSize();
   virtual void ViewHierarchyChanged(bool is_add, View *parent, View *child);
 
   // Overridden from ChromeViews::BaseButton::ButtonListener:
   virtual void ButtonPressed(ChromeViews::BaseButton* sender);
 
   // Overridden from LocationBarView::Delegate:
   virtual TabContents* GetTabContents();
   virtual void OnInputInProgress(bool in_progress);
 
   // Updates the current throbber animation frame; called from the
@@ skipping 187 matching lines @@
   } else {
     height = kNoTitleTopSpacing;
   }
 
   return height;
 }
 
 int ConstrainedWindowNonClientView::CalculateNonClientHeight(
     bool with_url_field) const {
   int r = CalculateTitlebarHeight();
-
-  if (with_url_field) {
-    CSize s;
-    location_bar_->GetPreferredSize(&s);
-    r += s.cy;
-  }
+  if (with_url_field)
+    r += location_bar_->GetPreferredSize().height();
   return r;
 }
 
 gfx::Rect ConstrainedWindowNonClientView::CalculateWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds,
     bool with_url_field) const {
   int non_client_height = CalculateNonClientHeight(with_url_field);
   gfx::Rect window_bounds = client_bounds;
   window_bounds.set_width(
       window_bounds.width() + 2 * kWindowHorizontalBorderSize);
@@ skipping 121 matching lines @@
 }
 
 void ConstrainedWindowNonClientView::Layout() {
   bool should_display_url_field = false;
   if (location_bar_) {
     should_display_url_field = ShouldDisplayURLField();
     location_bar_->SetVisible(should_display_url_field);
   }
 
   int location_bar_height = 0;
-  CSize ps;
+  gfx::Size ps;
   if (should_display_url_field) {
-    location_bar_->GetPreferredSize(&ps);
-    location_bar_height = ps.cy;
+    ps = location_bar_->GetPreferredSize();
+    location_bar_height = ps.height();
   }
 
-  close_button_->GetPreferredSize(&ps);
-  close_button_->SetBounds(width() - ps.cx - kWindowControlsRightOffset,
-                           kWindowControlsTopOffset, ps.cx, ps.cy);
+  ps = close_button_->GetPreferredSize();
+  close_button_->SetBounds(width() - ps.width() - kWindowControlsRightOffset,
+                           kWindowControlsTopOffset, ps.width(), ps.height());
 
   int titlebar_height = CalculateTitlebarHeight();
   if (window_delegate_) {
     if (show_throbber_) {
       int icon_y = (titlebar_height - kWindowIconSize) / 2;
       icon_bounds_.SetRect(kWindowLeftSpacing, icon_y, 0, 0);
       icon_bounds_.set_width(kWindowIconSize);
       icon_bounds_.set_height(kWindowIconSize);
     } else {
       icon_bounds_.SetRect(0, 0, 0, 0);
@@ skipping 19 matching lines @@
     location_bar_->SetBounds(client_bounds_.x() - kLocationBarOffset,
                              client_bounds_.y() - location_bar_height - 
                              kLocationBarSpacing,
                              client_bounds_.width() + kLocationBarOffset * 2,
                              location_bar_height);
     location_bar_->Layout();
   }
   container_->client_view()->SetBounds(client_bounds_.ToRECT());
 }
 
-void ConstrainedWindowNonClientView::GetPreferredSize(CSize* out) {
-  DCHECK(out);
-  container_->client_view()->GetPreferredSize(out);
-  out->cx += 2 * kWindowHorizontalBorderSize;
-  out->cy += CalculateNonClientHeight(ShouldDisplayURLField()) +
-      kWindowVerticalBorderSize;
+gfx::Size ConstrainedWindowNonClientView::GetPreferredSize() {
+  gfx::Size prefsize = container_->client_view()->GetPreferredSize();
+  prefsize.Enlarge(2 * kWindowHorizontalBorderSize, 
+                   CalculateNonClientHeight(ShouldDisplayURLField()) +
+                       kWindowVerticalBorderSize);
+  return prefsize;
 }
 
 void ConstrainedWindowNonClientView::ViewHierarchyChanged(bool is_add,
                                                           View *parent,
                                                           View *child) {
   if (is_add && GetViewContainer()) {
     // Add our Client View as we are added to the ViewContainer so that if we
     // are subsequently resized all the parent-child relationships are
     // established.
     if (is_add && GetViewContainer() && child == this)
@@ skipping 736 matching lines @@
           initial_bounds,
           parent->delegate()->ShouldDisplayURLField());
 
   window->InitSizeForContents(window_bounds);
 
   // This is a constrained popup window and thus we need to animate it in.
   window->StartSuppressedAnimation();
 
   return window;
 }