Convert GetPreferredSize from:...

chrome/browser/views/download_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/browser/views/download_item_view.h"
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/string_util.h"
@@ skipping 55 matching lines @@
     drop_down_state_(NORMAL),
     drop_down_pressed_(false),
     status_text_(l10n_util::GetString(IDS_DOWNLOAD_STATUS_STARTING)),
     show_status_text_(true),
     dragging_(false),
     starting_drag_(false),
     warning_icon_(NULL),
     save_button_(NULL),
     discard_button_(NULL),
     dangerous_download_label_(NULL),
-    dangerous_download_label_sized_(false),
-    cached_button_size_(0, 0) {
+    dangerous_download_label_sized_(false) {
   // TODO(idana) Bug# 1163334
   //
   // We currently do not mirror each download item on the download shelf (even
   // though the download shelf itself is mirrored and the items appear from
   // right to left on RTL UIs).
   //
   // We explicitly disable mirroring for the item because the code that draws
   // the download progress animation relies on the View's UI layout setting
   // when positioning the animation so we should make sure that code doesn't
   // treat our View as a mirrored View.
@@ skipping 83 matching lines @@
                                   kVerticalTextPadding + font_.height(),
                               2 * kVerticalPadding +
                                   normal_body_image_set_.top_left->height() +
                                   normal_body_image_set_.bottom_left->height());
 
   if (download_util::kSmallProgressIconSize > box_height_)
     box_y_ = (download_util::kSmallProgressIconSize - box_height_) / 2;
   else
     box_y_ = kVerticalPadding;
 
-  CSize size;
-  GetPreferredSize(&size);
-  drop_down_x_ = size.cx - normal_drop_down_image_set_.top->width();
+  gfx::Size size = GetPreferredSize();
+  drop_down_x_ = size.width() - normal_drop_down_image_set_.top->width();
 
   body_hover_animation_.reset(new SlideAnimation(this));
   drop_hover_animation_.reset(new SlideAnimation(this));
 
   if (download->safety_state() == DownloadItem::DANGEROUS) {
     body_state_ = DANGEROUS;
     drop_down_state_ = DANGEROUS;
 
     warning_icon_ = rb.GetBitmapNamed(IDR_WARNING);
     save_button_ = new ChromeViews::NativeButton(
@@ skipping 102 matching lines @@
 // In dangerous mode we have to layout our buttons.
 void DownloadItemView::Layout() {
   if (IsDangerousMode()) {
     SizeLabelToMinWidth();
     int x = kLeftPadding + dangerous_mode_body_image_set_.top_left->width() +
       warning_icon_->width() + kLabelPadding;
     int y = (height() - dangerous_download_label_->height()) / 2;
     dangerous_download_label_->SetBounds(x, y,
                                          dangerous_download_label_->width(),
                                          dangerous_download_label_->height());
-    CSize button_size;
-    GetButtonSize(&button_size);
+    gfx::Size button_size = GetButtonSize();
     x += dangerous_download_label_->width() + kLabelPadding;
-    y = (height() - button_size.cy) / 2;
-    save_button_->SetBounds(x, y, button_size.cx, button_size.cy);
-    x += button_size.cx + kButtonPadding;
-    discard_button_->SetBounds(x, y, button_size.cx, button_size.cy);
+    y = (height() - button_size.height()) / 2;
+    save_button_->SetBounds(x, y, button_size.width(), button_size.height());
+    x += button_size.width() + kButtonPadding;
+    discard_button_->SetBounds(x, y, button_size.width(),
+                               button_size.height());
   }
 }
 
 void DownloadItemView::DidChangeBounds(const CRect& previous,
                                        const CRect& current) {
   Layout();
 }
 
 void DownloadItemView::ButtonPressed(ChromeViews::NativeButton* sender) {
   if (sender == discard_button_) {
@@ skipping 220 matching lines @@
   dangerous_download_label_ = NULL;
 
   // We need to load the icon now that the download_ has the real path.
   LoadIcon();
 
   // Force the shelf to layout again as our size has changed.
   parent_->Layout();
   parent_->SchedulePaint();
 }
 
-void DownloadItemView::GetPreferredSize(CSize* out) {
+gfx::Size DownloadItemView::GetPreferredSize() {
   int width, height;
   if (IsDangerousMode()) {
     width = kLeftPadding + dangerous_mode_body_image_set_.top_left->width();
     width += warning_icon_->width() + kLabelPadding;
     width += dangerous_download_label_->width() + kLabelPadding;
-    CSize button_size;
-    GetButtonSize(&button_size);
-    width += button_size.cx * 2 + kButtonPadding;
+    gfx::Size button_size = GetButtonSize();
+    width += button_size.width() * 2 + kButtonPadding;
     width += dangerous_mode_body_image_set_.top_right->width();
     height = std::max<int>(2 * kVerticalPadding +  2 * font_.height() +
                              kVerticalTextPadding,
                            2 * kVerticalPadding + warning_icon_->height());
-    height = std::max<int>(height, 2 * kVerticalPadding + button_size.cy);
+    height = std::max<int>(height,
+                           2 * kVerticalPadding + button_size.height());
   } else {
     width = kLeftPadding + normal_body_image_set_.top_left->width();
     width += download_util::kSmallProgressIconSize;
     width += kTextWidth;
     width += normal_body_image_set_.top_right->width();
     width += normal_drop_down_image_set_.top->width();
     height = std::max<int>(2 * kVerticalPadding +  2 * font_.height() +
                              kVerticalTextPadding,
                            download_util::kSmallProgressIconSize);
   }
-  out->cx = width;
-  out->cy = height;
+  return gfx::Size(width, height);
 }
 
 void DownloadItemView::OnMouseExited(const ChromeViews::MouseEvent& event) {
   // Mouse should not activate us in dangerous mode.
   if (IsDangerousMode())
     return;
 
   SetState(NORMAL, drop_down_pressed_ ? PUSHED : NORMAL);
   body_hover_animation_->Hide();
   drop_hover_animation_->Hide();
@@ skipping 132 matching lines @@
   GetParent()->SchedulePaint();
 }
 
 void DownloadItemView::LoadIcon() {
   IconManager* im = g_browser_process->icon_manager();
   im->LoadIcon(download_->full_path(), IconLoader::SMALL,
                &icon_consumer_,
                NewCallback(this, &DownloadItemView::OnExtractIconComplete));
 }
 
-void DownloadItemView::GetButtonSize(CSize* size) {
+gfx::Size DownloadItemView::GetButtonSize() {
   DCHECK(save_button_ && discard_button_);
+  gfx::Size size;
+
   // We cache the size when successfully retrieved, not for performance reasons
   // but because if this DownloadItemView is being animated while the tab is
   // not showing, the native buttons are not parented and their preferred size
   // is 0, messing-up the layout.
-  if (cached_button_size_.cx != 0) {
-    *size = cached_button_size_;
-  }
+  if (cached_button_size_.width() != 0)
+    size = cached_button_size_;
 
-  CSize tmp_size;
-  save_button_->GetMinimumSize(size);
-  discard_button_->GetMinimumSize(&tmp_size);
+  size = save_button_->GetMinimumSize();
+  gfx::Size discard_size = discard_button_->GetMinimumSize();
 
-  size->cx = std::max(size->cx, tmp_size.cx);
-  size->cy = std::max(size->cy, tmp_size.cy);
+  size.SetSize(std::max(size.width(), discard_size.width()),
+               std::max(size.height(), discard_size.height()));
 
-  if (size->cx != 0) {
-    cached_button_size_.cx = size->cx;
-    cached_button_size_.cy = size->cy;
-  }
+  if (size.width() != 0)
+    cached_button_size_ = size;
+
+  return size;
 }
 
 // This method computes the miminum width of the label for diplaying its text
 // on 2 lines.  It just breaks the string in 2 lines on the spaces and keeps the
 // configuration with minimum width.
 void DownloadItemView::SizeLabelToMinWidth() {
   if (dangerous_download_label_sized_)
     return;
 
   std::wstring text = dangerous_download_label_->GetText();
   TrimWhitespace(text, TRIM_ALL, &text);
   DCHECK_EQ(std::wstring::npos, text.find(L"\n"));
 
   // Make the label big so that GetPreferredSize() is not constrained by the
   // current width.
   dangerous_download_label_->SetBounds(0, 0, 1000, 1000);
 
-  CSize size(0, 0);
+  gfx::Size size;
   int min_width = -1;
   int sp_index = text.find(L" ");
   while (sp_index != std::wstring::npos) {
     text.replace(sp_index, 1, L"\n");
     dangerous_download_label_->SetText(text);
-    dangerous_download_label_->GetPreferredSize(&size);
+    size = dangerous_download_label_->GetPreferredSize();
     
     if (min_width == -1)
-      min_width = size.cx;
+      min_width = size.width();
  
-    // If thw width is growing again, it means we passed the optimal width spot.
-    if (size.cx > min_width)
+    // If the width is growing again, it means we passed the optimal width spot.
+    if (size.width() > min_width)
       break;
     else
-      min_width = size.cx;
+      min_width = size.width();
 
     // Restore the string.
     text.replace(sp_index, 1, L" ");
 
     sp_index = text.find(L" ", sp_index + 1);
   }
 
   // If we have a line with no space, we won't cut it.
   if (min_width == -1)
-    dangerous_download_label_->GetPreferredSize(&size);
+    size = dangerous_download_label_->GetPreferredSize();
 
-  dangerous_download_label_->SetBounds(0, 0, size.cx, size.cy);
+  dangerous_download_label_->SetBounds(gfx::Point(), size);
   dangerous_download_label_sized_ = true;
 }