| Index: chrome/browser/ui/views/harmony/chrome_typography.cc
|
| diff --git a/chrome/browser/ui/views/harmony/chrome_typography.cc b/chrome/browser/ui/views/harmony/chrome_typography.cc
|
| index 5fc70512a2245318d268b10dda05f7a2aed41e19..b83b31ea357392e661d2c677197f0647c76830e5 100644
|
| --- a/chrome/browser/ui/views/harmony/chrome_typography.cc
|
| +++ b/chrome/browser/ui/views/harmony/chrome_typography.cc
|
| @@ -45,3 +45,13 @@ const gfx::FontList& LegacyTypographyProvider::GetFont(int text_context,
|
| return ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(
|
| size_delta, kFontStyle, font_weight);
|
| }
|
| +
|
| +SkColor LegacyTypographyProvider::GetColor(int context,
|
| + int style,
|
| + const ui::NativeTheme& theme) const {
|
| + // Use "disabled grey" for HINT and SECONDARY when Harmony is disabled.
|
| + if (style == STYLE_HINT || style == STYLE_SECONDARY)
|
| + style = views::style::STYLE_DISABLED;
|
| +
|
| + return DefaultTypographyProvider::GetColor(context, style, theme);
|
| +}
|
|
|