Index: ui/views/controls/label.h |
diff --git a/ui/views/controls/label.h b/ui/views/controls/label.h |
index 0881558cacb215faa7342a9d493257f4e80da3bc..98a9f3b7f37d7350e1b2a706476e72f6e0a4b4d5 100644 |
--- a/ui/views/controls/label.h |
+++ b/ui/views/controls/label.h |
@@ -82,10 +82,9 @@ class VIEWS_EXPORT Label : public View, |
// Sets the color. This will automatically force the color to be readable |
// over the current background color, if auto color readability is enabled. |
virtual void SetEnabledColor(SkColor color); |
- void SetDisabledColor(SkColor color); |
+ void SetDisabledColorForLabelButton(SkColor color); |
Peter Kasting
2017/06/01 04:55:58
Nit: I kinda wish we had a better way of doing thi
tapted
2017/06/01 11:22:18
The follow-up CL that removes this is basically re
|
SkColor enabled_color() const { return actual_enabled_color_; } |
- SkColor disabled_color() const { return actual_disabled_color_; } |
// Sets the background color. This won't be explicitly drawn, but the label |
// will force the text color to be readable over it. |
@@ -326,6 +325,9 @@ class VIEWS_EXPORT Label : public View, |
// Builds |context_menu_contents_|. |
void BuildContextMenuContents(); |
+ // Where the label appears in the UI. Passed in from the constructor. |
Peter Kasting
2017/06/01 04:55:58
Nit: Maybe say this is a value defined in typograp
tapted
2017/06/01 11:22:18
Done.
|
+ const int text_context_; |
+ |
// An un-elided and single-line RenderText object used for preferred sizing. |
std::unique_ptr<gfx::RenderText> render_text_; |