Convert GetPreferredSize from:...

chrome/browser/native_ui_contents.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/native_ui_contents.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/history_tab_ui.h"
 #include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/views/download_tab_view.h"
@@ skipping 575 matching lines @@
   scroll_view_->SetContents(contents);
 }
 
 ChromeViews::View* SearchableUIContainer::GetContents() {
   return scroll_view_->GetContents();
 }
 
 void SearchableUIContainer::Layout() {
   View::Layout();
 
-  CSize search_button_size;
-  search_button_->GetPreferredSize(&search_button_size);
-
-  CSize product_logo_size;
-  product_logo_->GetPreferredSize(&product_logo_size);
+  gfx::Size search_button_size = search_button_->GetPreferredSize();
+  gfx::Size product_logo_size = product_logo_->GetPreferredSize();
 
   int field_width = kDestinationSearchOffset + 
     kDestinationSearchWidth +
     kDestinationSmallerMargin +
-    static_cast<int>(search_button_size.cx) +
+    static_cast<int>(search_button_size.width()) +
     kDestinationSmallerMargin;
 
   product_logo_->SetBounds(std::max(width() - kProductLogo->width() - 
                                kProductLogoPadding,
                                field_width), 
                            kProductLogoPadding, 
-                           product_logo_size.cx, product_logo_size.cy);
+                           product_logo_size.width(),
+                           product_logo_size.height());
 }
 
 void SearchableUIContainer::Paint(ChromeCanvas* canvas) {
   SkColor top_color(kBackground);
   canvas->FillRectInt(top_color, 0, 0,
                       width(), scroll_view_->y());
 
   canvas->FillRectInt(kBottomMarginColor, 0, scroll_view_->y() -
                       kBottomMargin, width(), kBottomMargin);
 
@@ skipping 43 matching lines @@
     DoSearch();
 }
 
 void SearchableUIContainer::DoSearch() {
   if (delegate_)
     delegate_->DoSearch(search_field_->GetText());
 
   scroll_view_->ScrollToPosition(scroll_view_->vertical_scroll_bar(), 0);
 }