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

Unified Diff: ui/views/controls/button/label_button.h

Issue 23228004: Prepare to use gfx::RenderText in views::Label. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert Label implementation changes. Created 6 years, 5 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
« no previous file with comments | « ui/views/controls/button/blue_button.cc ('k') | ui/views/controls/button/label_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/label_button.h
diff --git a/ui/views/controls/button/label_button.h b/ui/views/controls/button/label_button.h
index 4c569ff0f5b6346d61dd51bad499727400fe39d8..bceaf715654a99e288ae0f677d463a2c16a5d6de 100644
--- a/ui/views/controls/button/label_button.h
+++ b/ui/views/controls/button/label_button.h
@@ -65,9 +65,6 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
gfx::HorizontalAlignment GetHorizontalAlignment() const;
void SetHorizontalAlignment(gfx::HorizontalAlignment alignment);
- // Set the directionality mode used for the button text.
- void SetDirectionalityMode(gfx::DirectionalityMode mode);
-
// Call set_min_size(gfx::Size()) to clear the monotonically increasing size.
void set_min_size(const gfx::Size& min_size) { min_size_ = min_size; }
void set_max_size(const gfx::Size& max_size) { max_size_ = max_size; }
@@ -86,6 +83,7 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
// View:
virtual void SetBorder(scoped_ptr<Border> border) OVERRIDE;
virtual gfx::Size GetPreferredSize() const OVERRIDE;
+ virtual int GetHeightForWidth(int w) const OVERRIDE;
virtual void Layout() OVERRIDE;
virtual const char* GetClassName() const OVERRIDE;
« no previous file with comments | « ui/views/controls/button/blue_button.cc ('k') | ui/views/controls/button/label_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698