chrome/browser/ui/views/harmony/chrome_typography.cc - Issue 2801583002: Use views::style for buttons, bootstrap ash_typography to do so.

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/chrome_typography.cc

Issue 2801583002: Use views::style for buttons, bootstrap ash_typography to do so. (Closed)

Patch Set: placate gn check. new_avatar_button now just avatar_button 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/chrome_typography.cc

diff --git a/chrome/browser/ui/views/harmony/chrome_typography.cc b/chrome/browser/ui/views/harmony/chrome_typography.cc

index f128f7c969f0c934839eb435b916725d789ef192..5fc70512a2245318d268b10dda05f7a2aed41e19 100644

--- a/chrome/browser/ui/views/harmony/chrome_typography.cc

+++ b/chrome/browser/ui/views/harmony/chrome_typography.cc

@@ -16,6 +16,10 @@ const gfx::FontList& LegacyTypographyProvider::GetFont(int text_context,

gfx::Font::Weight font_weight;

GetDefaultFont(text_context, text_style, &size_delta, &font_weight);

+#if defined(USE_ASH)

+ ash::ApplyAshFontStyles(text_context, text_style, &size_delta, &font_weight);

+#endif

switch (text_context) {

case CONTEXT_HEADLINE:

size_delta = kHeadlineDelta;