Convert GetPreferredSize from:...

chrome/browser/history_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/history_view.h"
 
 #include "base/string_util.h"
 #include "base/time_format.h"
 #include "base/word_iterator.h"
 #include "chrome/browser/browsing_data_remover.h"
@@ skipping 417 matching lines @@
   // where font or language choices cause the time label to be
   // horizontally large, we need to push everything to the right.
   //
   // If you fiddle with the calculations below, you may need to adjust
   // the favicon painting in Paint() (and in GetDragRegion by extension).
 
   // First we calculate the ideal position of the title.
   int title_x = kPageTitleOffset;
 
   // We calculate the size of the star.
-  CSize star_size;
-  star_toggle_->GetPreferredSize(&star_size);
+  gfx::Size star_size = star_toggle_->GetPreferredSize();
 
   // Measure and lay out the time label, and potentially move
   // our title to suit.
-  CSize time_size;
   Time visit_time = model_->GetVisitTime(model_index_);
   int time_x = kTimeOffset;
   if (visit_time.is_null()) {
     // We will get null times if the page has never been visited, for example,
     // bookmarks after you clear history.
     time_label_->SetText(std::wstring());
   } else if (show_full_) {
     time_x = 0;
     time_label_->SetText(base::TimeFormatShortDate(visit_time));
   } else {
     time_label_->SetText(base::TimeFormatTimeOfDay(visit_time));
   }
-  time_label_->GetPreferredSize(&time_size);
+  gfx::Size time_size = time_label_->GetPreferredSize();
 
   time_label_->SetBounds(time_x, kEntryPadding,
-                         time_size.cx, time_size.cy);
+                         time_size.width(), time_size.height());
 
   // Calculate the position of the favicon.
   int favicon_x = title_x - kFavIconSize - kIconPadding;
 
   // Now we look to see if the favicon overlaps the time label,
   // and if so, we push the title to the right. If we're not
   // showing the time label, then ignore this step.
-  int overlap = favicon_x - (time_x + time_size.cx + kIconPadding);
+  int overlap = favicon_x - (time_x + time_size.width() + kIconPadding);
   if (overlap < 0) {
     title_x -= overlap;
   }
 
   // Populate and measure the title label.
   const std::wstring& title = model_->GetTitle(model_index_);
   if (!title.empty())
     title_link_->SetText(title);
   else
     title_link_->SetText(l10n_util::GetString(IDS_HISTORY_UNTITLED_TITLE));
-  CSize title_size;
-  title_link_->GetPreferredSize(&title_size);
+  gfx::Size title_size = title_link_->GetPreferredSize();
 
   // Lay out the title label.
   int max_title_x;
 
   max_title_x = std::max(0, max_x - title_x);
 
-  if (title_size.cx + kEntryPadding > max_title_x) {
+  if (title_size.width() + kEntryPadding > max_title_x) {
     // We need to shrink the title to make everything fit.
-    title_size.cx = max_title_x - kEntryPadding;
+    title_size.set_width(max_title_x - kEntryPadding);
   }
   title_link_->SetBounds(title_x, kEntryPadding,
-                         title_size.cx, title_size.cy);
+                         title_size.width(), title_size.height());
 
   // Lay out the star.
   if (model_->IsStarred(model_index_)) {
-    star_toggle_->SetBounds(title_x + title_size.cx + kIconPadding,
-                            kEntryPadding, star_size.cx, star_size.cy);
+    star_toggle_->SetBounds(title_x + title_size.width() + kIconPadding,
+                            kEntryPadding, star_size.width(),
+                            star_size.height());
     star_toggle_->SetState(true);
     star_toggle_->SetVisible(true);
   } else {
     star_toggle_->SetVisible(false);
   }
 
   // Lay out the snippet label.
   snippet_label_->SetVisible(show_full_);
   if (show_full_) {
     const Snippet& snippet = model_->GetSnippet(model_index_);
@@ skipping 779 matching lines @@
   for (BreakOffsets::iterator i = break_offsets_.begin(); i != it; ++i) {
     if (i->second.day)
       offset++;
   }
   return offset;
 }
 
 int HistoryView::GetDeleteControlWidth() {
   if (delete_control_width_)
     return delete_control_width_;
-  CSize pref;
   EnsureRenderer();
-  delete_renderer_->GetPreferredSize(&pref);
-  delete_control_width_ = pref.cx;
+  gfx::Size pref = delete_renderer_->GetPreferredSize();
+  delete_control_width_ = pref.width();
   return delete_control_width_;
 }
 
 gfx::Rect HistoryView::CalculateDeleteControlBounds(int base_y) {
   // NOTE: the height here is too big, it should be just big enough to show
   // the link. Additionally this should be baseline aligned with the date. I'm
   // not doing that now as a redesign of HistoryView is in the works.
   const int delete_width = GetDeleteControlWidth();
   const int delete_x = width() - kRightMargin - delete_width;
   return gfx::Rect(delete_x,
                    base_y + kDeleteControlOffset,
                    delete_width,
                    kBrowseResultsHeight);
 }