Convert GetPreferredSize from:...

chrome/browser/views/info_bar_item_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 "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/views/info_bar_item_view.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/external_focus_tracker.h"
 #include "chrome/views/image_view.h"
 #include "chrome/views/root_view.h"
 #include "chrome/views/view_container.h"
 
 #include "generated_resources.h"
 
 namespace {
 
 class HorizontalSpacer : public ChromeViews::View {
  public:
   explicit HorizontalSpacer(int width) : width_(width) {}
 
-  void GetPreferredSize(CSize* out) {
-    out->cx = width_;
-    out->cy = 0;
+  gfx::Size GetPreferredSize() {
+    return gfx::Size(width_, 0);
   }
 
  private:
   int width_;
 };
 
 const int kInfoBarVerticalSpacing = 3;
 const int kInfoBarLeftMargin = 3;
 const double kInfoBarHeight = 37.0;
 
 } // namespace
 
 InfoBarItemView::InfoBarItemView()
     : insert_index_(0),
       close_button_(NULL),
       icon_(NULL) {
   Init();
 }
 
 InfoBarItemView::~InfoBarItemView() {
 }
 
 // static
 int InfoBarItemView::CenterPosition(int size, int target_size) {
   return (target_size - size) / 2;
 }
 
-void InfoBarItemView::GetPreferredSize(CSize* out) {
-  out->cx = GetParent()->width();
-  out->cy = static_cast<int>(kInfoBarHeight * animation_->GetCurrentValue());
+gfx::Size InfoBarItemView::GetPreferredSize() {
+  return gfx::Size(
+      GetParent()->width(),
+      static_cast<int>(kInfoBarHeight * animation_->GetCurrentValue()));
 }
 
 // The following is an overall note on the underlying implementation. You don't
 // need this in order to use this view. Ignore unless you're editing
 // implementation:
 // Layout() lays out all of its child views, but it uses insert_index_ to
 // decide whether to lay out on the left or right. Whenever a view is added or
 // removed the insert_index_ is updated accordingly to make sure it is directly
 // between left aligned views and right aligned views. Whenever a view is added,
 // a spacer view provides padding to the right of the view if the view is
@@ skipping 26 matching lines @@
 void InfoBarItemView::Layout() {
   int next_x = width() - kButtonHEdgeMargin;
   int height_diff = static_cast<int>(kInfoBarHeight) - height();
   const int child_count = GetChildViewCount();
   // Anything greater than or equal to insert_index_ is laid out on the right,
   // with the greatest index (the first one added to the right) being laid out
   // rightmost.
   for (int i = child_count - 1; i >= insert_index_ ; i--) {
     View* v = GetChildViewAt(i);
     if (v->IsVisible()) {
-      CSize view_size;
-      v->GetPreferredSize(&view_size);
-      next_x = next_x - view_size.cx;
+      gfx::Size view_size = v->GetPreferredSize();
+      next_x = next_x - view_size.width();
       v->SetBounds(next_x,
-                   CenterPosition(view_size.cy,
+                   CenterPosition(view_size.height(),
                        static_cast<int>(kInfoBarHeight)) - height_diff,
-                   view_size.cx,
-                   view_size.cy);
+                   view_size.width(),
+                   view_size.height());
     }
   }
   int left_most_x = next_x;
 
   next_x = kInfoBarLeftMargin;
 
   // Anything less than insert_index_ is laid out on the left, with the
   // smallest index (the first one added to the left) being laid out leftmost.
   for (int i = 0; i < insert_index_ ; i++) {
     View* v = GetChildViewAt(i);
     if (v->IsVisible()) {
-      CSize view_size;
-      v->GetPreferredSize(&view_size);
+      gfx::Size view_size = v->GetPreferredSize();
       int remaining_space = std::max(0, left_most_x - next_x);
-      if (view_size.cx > remaining_space) {
-        view_size.cx = remaining_space;
+      if (view_size.width() > remaining_space) {
+        view_size.set_width(remaining_space);
       }
       v->SetBounds(next_x,
-                   CenterPosition(view_size.cy,
+                   CenterPosition(view_size.height(),
                        static_cast<int>(kInfoBarHeight)) - height_diff,
-                   view_size.cx,
-                   view_size.cy);
-      next_x = next_x + view_size.cx;
+                   view_size.width(),
+                   view_size.height());
+      next_x = next_x + view_size.width();
     }
   }
 }
 
 void InfoBarItemView::DidChangeBounds(const CRect& previous,
                                       const CRect& current) {
   if (GetParent() != NULL)
     Layout();
 }
 
@@ skipping 139 matching lines @@
                           rb.GetBitmapNamed(IDR_CLOSE_BAR_P));
   close_button_->SetListener(this, 0);
   close_button_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_CLOSE));
   AddChildViewTrailing(close_button_);
 
   animation_.reset(new SlideAnimation(this));
   animation_->SetTweenType(SlideAnimation::NONE);
   animation_->Show();
 }