Convert GetPreferredSize from:...

chrome/browser/views/options/options_window_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/options_window.h"
 
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/options/advanced_page_view.h"
@@ skipping 35 matching lines @@
   virtual std::wstring GetWindowTitle() const;
   virtual void WindowClosing();
   virtual bool Cancel();
   virtual ChromeViews::View* GetContentsView();
 
   // ChromeViews::TabbedPane::Listener implementation:
   virtual void TabSelectedAt(int index);
 
   // ChromeViews::View overrides:
   virtual void Layout();
-  virtual void GetPreferredSize(CSize* out);
+  virtual gfx::Size GetPreferredSize();
 
  protected:
   // ChromeViews::View overrides:
   virtual void ViewHierarchyChanged(bool is_add,
                                     ChromeViews::View* parent,
                                     ChromeViews::View* child);
  private:
   // Init the assorted Tabbed pages
   void Init();
 
@@ skipping 89 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowView, ChromeViews::View overrides:
 
 void OptionsWindowView::Layout() {
   tabs_->SetBounds(kDialogPadding, kDialogPadding,
                    width() - (2 * kDialogPadding),
                    height() - (2 * kDialogPadding));
 }
 
-void OptionsWindowView::GetPreferredSize(CSize* out) {
-  DCHECK(out);
-  *out = ChromeViews::Window::GetLocalizedContentsSize(
+gfx::Size OptionsWindowView::GetPreferredSize() {
+  return gfx::Size(ChromeViews::Window::GetLocalizedContentsSize(
       IDS_OPTIONS_DIALOG_WIDTH_CHARS,
-      IDS_OPTIONS_DIALOG_HEIGHT_LINES).ToSIZE();
+      IDS_OPTIONS_DIALOG_HEIGHT_LINES));
 }
 
 void OptionsWindowView::ViewHierarchyChanged(bool is_add,
                                              ChromeViews::View* parent,
                                              ChromeViews::View* child) {
   // Can't init before we're inserted into a ViewContainer, because we require
   // a HWND to parent native child controls to.
   if (is_add && child == this)
     Init();
 }
@@ skipping 39 matching lines @@
   // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care
   //             about this case this will have to be fixed.
   if (!instance_) {
     instance_ = new OptionsWindowView(profile);
     ChromeViews::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_);
     // The window is alive by itself now...
   }
   instance_->ShowOptionsPage(page, highlight_group);
 }