| 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 6dade72706233e5cc6a2a7b7f38ed6f8ef09b358..11dd0f96e0067a7648f571f73f371253192f218d 100644
|
| --- a/ui/views/controls/button/label_button.h
|
| +++ b/ui/views/controls/button/label_button.h
|
| @@ -17,6 +17,7 @@
|
| #include "ui/views/controls/image_view.h"
|
| #include "ui/views/controls/label.h"
|
| #include "ui/views/native_theme_delegate.h"
|
| +#include "ui/views/style/typography.h"
|
|
|
| namespace views {
|
|
|
| @@ -33,7 +34,12 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
|
|
|
| static const char kViewClassName[];
|
|
|
| - LabelButton(ButtonListener* listener, const base::string16& text);
|
| + // Creates a LabelButton with ButtonPressed() events sent to |listener| and
|
| + // label |text|. |button_context| is a value from views::style::TextContext
|
| + // and determines the appearance of |text|.
|
| + LabelButton(ButtonListener* listener,
|
| + const base::string16& text,
|
| + int button_context = style::CONTEXT_LABEL);
|
| ~LabelButton() override;
|
|
|
| // Gets or sets the image shown for the specified button state.
|
| @@ -57,9 +63,6 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
|
| // Sets whether subpixel rendering is used on the label.
|
| void SetTextSubpixelRenderingEnabled(bool enabled);
|
|
|
| - // Adjusts the font size up or down by the given amount.
|
| - virtual void AdjustFontSize(int font_size_delta);
|
| -
|
| // Sets the elide behavior of this button.
|
| void SetElideBehavior(gfx::ElideBehavior elide_behavior);
|
|
|
| @@ -116,9 +119,6 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
|
| // these bounds if they need room to do manual painting.
|
| virtual gfx::Rect GetChildAreaBounds();
|
|
|
| - // Sets the font list used by this button.
|
| - virtual void SetFontList(const gfx::FontList& font_list);
|
| -
|
| // View:
|
| void OnPaint(gfx::Canvas* canvas) override;
|
| void OnFocus() override;
|
| @@ -193,9 +193,10 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
|
| // drawing |label_| on a layer (which can mess with subpixel anti-aliasing).
|
| InkDropContainerView* ink_drop_container_;
|
|
|
| - // The cached font lists in the normal and bold style.
|
| + // The cached font lists in the normal and default button style. The latter
|
| + // may be bold.
|
| gfx::FontList cached_normal_font_list_;
|
| - gfx::FontList cached_bold_font_list_;
|
| + gfx::FontList cached_default_button_font_list_;
|
|
|
| // The images and colors for each button state.
|
| gfx::ImageSkia button_state_images_[STATE_COUNT];
|
|
|