Convert GetPreferredSize from:...

chrome/views/window.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/views/window.h"
 
 #include "base/win_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 // TODO(beng): some day make this unfortunate dependency not exist.
 #include "chrome/browser/browser_list.h"
@@ skipping 307 matching lines @@
   client_view_ = client_view;
   if (non_client_view_) {
     // This will trigger the ClientView to be added by the non-client view.
     HWNDViewContainer::SetContentsView(non_client_view_);
   } else {
     HWNDViewContainer::SetContentsView(client_view_);
   }
 }
 
 void Window::SizeWindowToDefault() {
-  CSize pref(0, 0);
+  gfx::Size pref;
   if (non_client_view_) {
-    non_client_view_->GetPreferredSize(&pref);
+    pref = non_client_view_->GetPreferredSize();
   } else {
-    client_view_->GetPreferredSize(&pref);
+    pref = client_view_->GetPreferredSize();
   }
-  DCHECK(pref.cx > 0 && pref.cy > 0);
+  DCHECK(pref.width() > 0 && pref.height() > 0);
   // CenterAndSizeWindow adjusts the window size to accommodate the non-client
   // area.
-  win_util::CenterAndSizeWindow(owning_window(), GetHWND(), pref, true);
+  win_util::CenterAndSizeWindow(owning_window(), GetHWND(), pref.ToSIZE(),
+                                true);
 }
 
 void Window::RunSystemMenu(const CPoint& point) {
   // We need to reset and clean up any currently created system menu objects.
   // We need to call this otherwise there's a small chance that we aren't going
   // to get a system menu. We also can't take the return value of this
   // function. We need to call it *again* to get a valid HMENU.
   ::GetSystemMenu(GetHWND(), TRUE);
   HMENU system_menu = ::GetSystemMenu(GetHWND(), FALSE);
   int id = ::TrackPopupMenu(system_menu,
@@ skipping 309 matching lines @@
 void Window::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     nwse_cursor_ = LoadCursor(NULL, IDC_SIZENWSE);
     initialized = true;
   }
 }
 
 }  // namespace ChromeViews