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

Unified Diff: ui/native_theme/common_theme.cc

Issue 2240603002: Harmony checkbox/radio tweaks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests Created 4 years, 4 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 | « no previous file | ui/views/controls/button/checkbox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/native_theme/common_theme.cc
diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc
index edf361f0334f0800e3784e7bda46ac95ba8d14cd..07e756beedd0ba1da67551050266b4c5478afe3e 100644
--- a/ui/native_theme/common_theme.cc
+++ b/ui/native_theme/common_theme.cc
@@ -58,6 +58,7 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
return kMenuHighlightBackgroundColorMd;
case NativeTheme::kColorId_SelectedMenuItemForegroundColor:
return kSelectedMenuItemForegroundColorMd;
+
// Link
case NativeTheme::kColorId_LinkEnabled:
case NativeTheme::kColorId_LinkPressed:
@@ -103,6 +104,14 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
}
}
+ // Second wave of MD colors (colors that only appear in secondary UI).
+ if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+ static const SkColor kPrimaryTextColor = SkColorSetRGB(0x33, 0x33, 0x33);
+
+ if (color_id == NativeTheme::kColorId_LabelEnabledColor)
+ return kPrimaryTextColor;
+ }
+
// Pre-MD colors.
// Windows:
static const SkColor kWindowBackgroundColor = SK_ColorWHITE;
« no previous file with comments | « no previous file | ui/views/controls/button/checkbox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698