Convert GetPreferredSize from:...

chrome/browser/views/old_frames/simple_vista_frame.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/old_frames/simple_vista_frame.h"
 
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents.h"
@@ skipping 185 matching lines @@
 
 void SimpleVistaFrame::Layout() {
   VistaFrame::Layout();
 
   // This happens while executing Init().
   if (!location_bar_)
     return;
 
   if (browser_->ShouldDisplayURLField()) {
     TabContentsContainerView* container = GetTabContentsContainer();
-    CSize s;
-    location_bar_->GetPreferredSize(&s);
+    gfx::Size s = location_bar_->GetPreferredSize();
     location_bar_->SetBounds(container->x() - kLocationBarOutdent,
                              container->y() - kLocationBarOutdent,
                              container->width() + kLocationBarOutdent * 2,
-                             s.cy);
+                             s.height());
     container->SetBounds(container->x(),
                          location_bar_->y() + location_bar_->height() -
                          kLocationBarSpacing, container->width(),
                          container->height() - location_bar_->height() +
                          3);
     location_bar_->SetVisible(true);
     location_bar_->Layout();
   } else {
     location_bar_->SetVisible(false);
   }
 }
 
 void SimpleVistaFrame::InitAfterHWNDCreated() {
   icon_manager_.reset(new WebAppIconManager(*this));
   VistaFrame::InitAfterHWNDCreated();
 }
 
 TabContents* SimpleVistaFrame::GetTabContents() {
   return browser_->GetSelectedTabContents();
 }
 
 void SimpleVistaFrame::OnInputInProgress(bool in_progress) {
 }
 
 void SimpleVistaFrame::UpdateLocationBar() {
   if (location_bar_ && location_bar_->IsVisible())
     location_bar_->Update(NULL);
 }