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

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

Issue 10933085: Update ConstrainedWindowViews appearance according to mock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Browser test fixes Created 8 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
Index: ui/views/controls/button/text_button.h
diff --git a/ui/views/controls/button/text_button.h b/ui/views/controls/button/text_button.h
index 233d791656c232c745455ea448832a98996b6d50..da5afdcaddf236d3964eac7cc6c9366abcbc33a5 100644
--- a/ui/views/controls/button/text_button.h
+++ b/ui/views/controls/button/text_button.h
@@ -170,6 +170,8 @@ class VIEWS_EXPORT TextButtonBase : public CustomButton,
// current size.
void ClearMaxTextSize();
+ void set_min_width(int min_width) { min_width_ = min_width; }
+ void set_min_height(int min_height) { min_height_ = min_height; }
void set_max_width(int max_width) { max_width_ = max_width; }
void SetFont(const gfx::Font& font);
// Return the font used by this button.
@@ -278,6 +280,10 @@ class VIEWS_EXPORT TextButtonBase : public CustomButton,
// Space between text and shadow. Defaults to (1,1).
gfx::Point shadow_offset_;
+ // The dimensions of the button will be at least these values.
+ int min_width_;
+ int min_height_;
+
// The width of the button will never be larger than this value. A value <= 0
// indicates the width is not constrained.
int max_width_;
@@ -344,7 +350,6 @@ class VIEWS_EXPORT TextButton : public TextButtonBase {
// Overridden from View:
virtual gfx::Size GetPreferredSize() OVERRIDE;
virtual std::string GetClassName() const OVERRIDE;
- virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
// Overridden from TextButtonBase:
virtual void PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) OVERRIDE;
@@ -403,9 +408,6 @@ class VIEWS_EXPORT NativeTextButton : public TextButton {
explicit NativeTextButton(ButtonListener* listener);
NativeTextButton(ButtonListener* listener, const string16& text);
- // Overridden from View:
- virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
-
// Overridden from TextButton:
virtual gfx::Size GetMinimumSize() OVERRIDE;
virtual std::string GetClassName() const OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698