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

Unified Diff: chrome/browser/ui/views/harmony/chrome_typography.h

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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/harmony/chrome_typography.h
diff --git a/chrome/browser/ui/views/harmony/chrome_typography.h b/chrome/browser/ui/views/harmony/chrome_typography.h
index 394b04827c98601e60055e6c99b5bbb5f5ddfd3a..84bb16f3782e7d1da6b20fb24febac5d9a43e3c8 100644
--- a/chrome/browser/ui/views/harmony/chrome_typography.h
+++ b/chrome/browser/ui/views/harmony/chrome_typography.h
@@ -61,7 +61,10 @@ class LegacyTypographyProvider : public views::DefaultTypographyProvider {
LegacyTypographyProvider() = default;
// DefaultTypographyProvider:
- const gfx::FontList& GetFont(int text_context, int text_style) const override;
+ const gfx::FontList& GetFont(int context, int style) const override;
+ SkColor GetColor(int context,
+ int style,
+ const ui::NativeTheme& theme) const override;
private:
DISALLOW_COPY_AND_ASSIGN(LegacyTypographyProvider);

Powered by Google App Engine
This is Rietveld 408576698