Convert GetPreferredSize from:...

chrome/browser/task_manager.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/task_manager.h"
 
 #include "base/process_util.h"
 #include "base/stats_table.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 648 matching lines @@
                             public ChromeViews::LinkController,
                             public ChromeViews::ContextMenuController,
                             public Menu::Delegate {
  public:
   TaskManagerContents(TaskManager* task_manager,
                       TaskManagerTableModel* table_model);
   virtual ~TaskManagerContents();
 
   void Init(TaskManagerTableModel* table_model);
   virtual void Layout();
-  virtual void GetPreferredSize(CSize* out);
+  virtual gfx::Size GetPreferredSize();
   virtual void DidChangeBounds(const CRect& previous, const CRect& current);
   virtual void ViewHierarchyChanged(bool is_add, ChromeViews::View* parent,
                                     ChromeViews::View* child);
   void GetSelection(std::vector<int>* selection);
   void GetFocused(std::vector<int>* focused);
 
   // NativeButton::Listener implementation.
   virtual void ButtonPressed(ChromeViews::NativeButton* sender);
 
   // ChromeViews::TableViewObserver implementation.
@@ skipping 157 matching lines @@
 }
 
 void TaskManagerContents::Layout() {
   // kPanelHorizMargin is too big.
   const int kTableButtonSpacing = 12;
   CRect bounds;
   GetLocalBounds(&bounds, true);
   int x = bounds.left;
   int y = bounds.top;
 
-  CSize size;
-  kill_button_->GetPreferredSize(&size);
-  int prefered_width = size.cx;
-  int prefered_height = size.cy;
+  gfx::Size size = kill_button_->GetPreferredSize();
+  int prefered_width = size.width();
+  int prefered_height = size.height();
 
   tab_table_->SetBounds(
       x + kPanelHorizMargin,
       y + kPanelVertMargin,
       bounds.Width() - 2 * kPanelHorizMargin,
       bounds.Height() - 2 * kPanelVertMargin - prefered_height);
 
   // y-coordinate of button top left.
   CRect parent_bounds;
   GetParent()->GetLocalBounds(&parent_bounds, false);
   int y_buttons = parent_bounds.bottom - prefered_height - kButtonVEdgeMargin;
 
   kill_button_->SetBounds(
       x + bounds.Width() - prefered_width - kPanelHorizMargin,
       y_buttons,
       prefered_width,
       prefered_height);
 
-  about_memory_link_->GetPreferredSize(&size);
-  int link_prefered_width = size.cx;
-  int link_prefered_height = size.cy;
+  size = about_memory_link_->GetPreferredSize();
+  int link_prefered_width = size.width();
+  int link_prefered_height = size.height();
   // center between the two buttons horizontally, and line up with
   // bottom of buttons vertically.
   int link_y_offset = std::max(0, prefered_height - link_prefered_height) / 2;
   about_memory_link_->SetBounds(
       x + kPanelHorizMargin,
       y_buttons + prefered_height - link_prefered_height - link_y_offset,
       link_prefered_width,
       link_prefered_height);
 }
 
-void TaskManagerContents::GetPreferredSize(CSize* out) {
-  out->cx = kDefaultWidth;
-  out->cy = kDefaultHeight;
+gfx::Size TaskManagerContents::GetPreferredSize() {
+  return gfx::Size(kDefaultWidth, kDefaultHeight);
 }
 
 void TaskManagerContents::GetSelection(std::vector<int>* selection) {
   DCHECK(selection);
   for (ChromeViews::TableSelectionIterator iter  = tab_table_->SelectionBegin();
        iter != tab_table_->SelectionEnd(); ++iter) {
     // The TableView returns the selection starting from the end.
     selection->insert(selection->begin(), *iter);
   }
 }
@@ skipping 224 matching lines @@
 
 ChromeViews::View* TaskManager::GetContentsView() {
   return contents_.get();
 }
 
 // static
 TaskManager* TaskManager::GetInstance() {
   return Singleton<TaskManager>::get();
 }