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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/views/text_button.h

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/table_view.cc ('k') | chrome/views/text_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/views/text_button.h
===================================================================
--- chrome/views/text_button.h (revision 3391)
+++ chrome/views/text_button.h (working copy)
@@ -75,8 +75,8 @@
ALIGN_RIGHT
};
- void GetPreferredSize(CSize* result);
- void GetMinimumSize(CSize* result);
+ virtual gfx::Size GetPreferredSize();
+ virtual gfx::Size GetMinimumSize();
virtual bool OnMousePressed(const ChromeViews::MouseEvent& e);
// Call SetText once per string in your set of possible values at
@@ -113,11 +113,11 @@
private:
std::wstring text_;
- CSize text_size_;
+ gfx::Size text_size_;
// Track the size of the largest text string seen so far, so that
// changing text_ will not resize the button boundary.
- CSize max_text_size_;
+ gfx::Size max_text_size_;
TextAlignment alignment_;
« chrome/browser/views/download_shelf_view.cc ('K') | « chrome/views/table_view.cc ('k') | chrome/views/text_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698