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

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

Issue 2961223002: Rename native theme color constants relating to text on dialog buttons
Patch Set: rebase Created 3 years, 6 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/native_theme/native_theme_win.cc ('k') | ui/views/controls/button/label_button_unittest.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.cc
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index 2c49f26d87ff1443c964f58135f28a8e51b4d6bb..e8148ebedadfe4381cdf1e8ddfe9e39ac8e048d4 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -422,18 +422,18 @@ void LabelButton::ResetColorsFromNativeTheme() {
// pre-MD, although in the MD world labels and buttons get different colors.
// TODO(estade): simplify this by removing STYLE_BUTTON.
SkColor colors[STATE_COUNT] = {
- theme->GetSystemColor(button_style
- ? ui::NativeTheme::kColorId_ButtonEnabledColor
- : ui::NativeTheme::kColorId_LabelEnabledColor),
+ theme->GetSystemColor(
+ button_style ? ui::NativeTheme::kColorId_TextOnEnabledDialogButton
+ : ui::NativeTheme::kColorId_LabelEnabledColor),
theme->GetSystemColor(button_style
? ui::NativeTheme::kColorId_ButtonHoverColor
: ui::NativeTheme::kColorId_LabelEnabledColor),
theme->GetSystemColor(button_style
? ui::NativeTheme::kColorId_ButtonHoverColor
: ui::NativeTheme::kColorId_LabelEnabledColor),
- theme->GetSystemColor(button_style
- ? ui::NativeTheme::kColorId_ButtonDisabledColor
- : ui::NativeTheme::kColorId_LabelDisabledColor),
+ theme->GetSystemColor(
+ button_style ? ui::NativeTheme::kColorId_TextOnDisabledDialogButton
+ : ui::NativeTheme::kColorId_LabelDisabledColor),
};
// Use hardcoded colors for inverted color scheme support and STYLE_BUTTON.
« no previous file with comments | « ui/native_theme/native_theme_win.cc ('k') | ui/views/controls/button/label_button_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698