summaryrefslogtreecommitdiffstats
path: root/chrome/views/menu_button.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/views/menu_button.cc')
-rw-r--r--chrome/views/menu_button.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/views/menu_button.cc b/chrome/views/menu_button.cc
index b8fd1b6..a7eeb46 100644
--- a/chrome/views/menu_button.cc
+++ b/chrome/views/menu_button.cc
@@ -65,12 +65,14 @@ MenuButton::~MenuButton() {
//
////////////////////////////////////////////////////////////////////////////////
-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) {