Convert GetPreferredSize from:...

chrome/views/hwnd_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/views/hwnd_view.h"
 
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/focus_manager.h"
 #include "chrome/views/scroll_view.h"
 #include "chrome/views/view_container.h"
 #include "base/logging.h"
 
 namespace ChromeViews {
 
 static const char kViewClassName[] = "chrome/views/HWNDView";
 
 HWNDView::HWNDView() :
     hwnd_(0),
-    preferred_size_(0, 0),
     installed_clip_(false),
     fast_resize_(false),
     focus_view_(NULL) {
   // HWNDs are placed relative to the root. As such, we need to
   // know when the position of any ancestor changes, or our visibility relative
   // to other views changed as it'll effect our position relative to the root.
   SetNotifyWhenVisibleBoundsInRootChanges(true);
 }
 
 HWNDView::~HWNDView() {
@@ skipping 107 matching lines @@
 }
 
 void HWNDView::VisibilityChanged(View* starting_from, bool is_visible) {
   //UpdateHWNDBounds();
   if (IsVisibleInRootView())
     ::ShowWindow(hwnd_, SW_SHOW);
   else
     ::ShowWindow(hwnd_, SW_HIDE);
 }
 
-void HWNDView::GetPreferredSize(CSize *out) {
-  out->cx = preferred_size_.cx;
-  out->cy = preferred_size_.cy;
-}
-
-void HWNDView::SetPreferredSize(const CSize& size) {
-  preferred_size_ = size;
+gfx::Size HWNDView::GetPreferredSize() {
+  return preferred_size_;
 }
 
 void HWNDView::ViewHierarchyChanged(bool is_add, View *parent, View *child) {
   if (hwnd_) {
     ViewContainer* vc = GetViewContainer();
     if (is_add && vc) {
       HWND parent = ::GetParent(hwnd_);
       HWND vc_hwnd = vc->GetHWND();
       if (parent != vc_hwnd) {
         ::SetParent(hwnd_, vc_hwnd);
@@ skipping 27 matching lines @@
     canvas->FillRectInt(SkColorSetRGB(255, 255, 255), 0, 0,
                         bounds_.Width(), bounds_.Height());
 }
 
 std::string HWNDView::GetClassName() const {
   return kViewClassName;
 }
 
 }