chrome/browser/ui/views/harmony/harmony_typography_provider.h - Issue 2910153002: Remove views::Label::SetDisabledColor(). Replace with typography colors.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/harmony/harmony_typography_provider.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:

Index: chrome/browser/ui/views/harmony/harmony_typography_provider.h

diff --git a/chrome/browser/ui/views/harmony/harmony_typography_provider.h b/chrome/browser/ui/views/harmony/harmony_typography_provider.h

index 7885f2ceed8e30140ce11ee38abdd4cb693f4caa..d3b4a8e953fcc62d36a8ca70b28738e0db623331 100644

--- a/chrome/browser/ui/views/harmony/harmony_typography_provider.h

+++ b/chrome/browser/ui/views/harmony/harmony_typography_provider.h

@@ -14,8 +14,10 @@ class HarmonyTypographyProvider : public views::TypographyProvider {

HarmonyTypographyProvider() = default;

// TypographyProvider:

- const gfx::FontList& GetFont(int text_context, int text_style) const override;

- SkColor GetColor(int context, int 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;

int GetLineHeight(int context, int style) const override;

private: