Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1838)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/views/menu_button.cc

Issue 7344: Convert GetPreferredSize from:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/views/download_shelf_view.cc ('K') | « chrome/views/menu_button.h ('k') | chrome/views/message_box_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/views/menu_button.cc
===================================================================
--- chrome/views/menu_button.cc (revision 3391)
+++ chrome/views/menu_button.cc (working copy)
@@ -65,12 +65,14 @@
//
////////////////////////////////////////////////////////////////////////////////
-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) {
« chrome/browser/views/download_shelf_view.cc ('K') | « chrome/views/menu_button.h ('k') | chrome/views/message_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698