ui/views/controls/button/label_button.cc - Issue 2910153002: Remove views::Label::SetDisabledColor(). Replace with typography colors.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2910153002: Remove views::Label::SetDisabledColor(). Replace with typography colors. (Closed)

Patch Set: rebase for r476345 Created 3 years, 7 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:

Index: ui/views/controls/button/label_button.cc

diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc

index 6fb6e39e9eafc1573bea07984ffa5c4e2c40c205..87283f35c764234d9e08a9b3119dff798eb8799f 100644

--- a/ui/views/controls/button/label_button.cc

+++ b/ui/views/controls/button/label_button.cc

@@ -99,7 +99,7 @@ void LabelButton::SetText(const base::string16& text) {

void LabelButton::SetTextColor(ButtonState for_state, SkColor color) {

button_state_colors_[for_state] = color;

if (for_state == STATE_DISABLED)

- label_->SetDisabledColor(color);

+ label_->SetDisabledColorForLabelButton(color);

else if (for_state == state())

label_->SetEnabledColor(color);

explicitly_set_colors_[for_state] = true;