Chromium Code Reviews| 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); |
|
sky
2016/08/13 16:03:32
optional: Is there a reason you want this here, an
Evan Stade
2016/08/14 01:49:21
I was following the convention in the rest of the
|
| + |
| + if (color_id == NativeTheme::kColorId_LabelEnabledColor) |
| + return kPrimaryTextColor; |
| + } |
| + |
| // Pre-MD colors. |
| // Windows: |
| static const SkColor kWindowBackgroundColor = SK_ColorWHITE; |