Convert GetPreferredSize from:...

chrome/views/menu_button.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 <atlbase.h>
 #include <atlapp.h>
 
 #include "chrome/views/menu_button.h"
 
 #include "chrome/app/theme/theme_resources.h"
@@ skipping 47 matching lines @@
 
 MenuButton::~MenuButton() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuButton - Public APIs
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-void MenuButton::GetPreferredSize(CSize* result) {
-  TextButton::GetPreferredSize(result);
+gfx::Size MenuButton::GetPreferredSize() {
+  gfx::Size prefsize = TextButton::GetPreferredSize();
   if (show_menu_marker_) {
-    result->cx += kMenuMarker->width() + kMenuMarkerPaddingLeft +
-        kMenuMarkerPaddingRight;
+    prefsize.Enlarge(kMenuMarker->width() + kMenuMarkerPaddingLeft +
+                         kMenuMarkerPaddingRight,
+                     0);
   }
+  return prefsize;
 }
 
 void MenuButton::Paint(ChromeCanvas* canvas, bool for_drag) {
   TextButton::Paint(canvas, for_drag);
 
   if (show_menu_marker_) {
     gfx::Insets insets = GetInsets();
 
     // We can not use the ChromeViews' mirroring infrastructure for mirroring
     // a MenuButton control (see TextButton::Paint() for a detailed
@@ skipping 165 matching lines @@
 // cause the button to appear depressed while the menu is displayed.
 void MenuButton::OnMouseExited(const MouseEvent& event) {
   using namespace ChromeViews;
   if ((state_ != BS_DISABLED) && (!menu_visible_) && (!InDrag())) {
     SetState(BS_NORMAL);
   }
 }
 
 }  // namespace ChromeViews