ios/chrome/browser/ui/ntp/recent_tabs/views/show_full_history_view.mm - Issue 2912863005: Use MDCTypography instead of MDFRobotoFontLoader directly.

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: ios/chrome/browser/ui/ntp/recent_tabs/views/show_full_history_view.mm

Issue 2912863005: Use MDCTypography instead of MDFRobotoFontLoader directly. (Closed)

Patch Set: Tentative fix for ManualTextFramerTest 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

« no previous file with comments | « ios/chrome/browser/ui/ntp/recent_tabs/views/session_tab_data_view.mm ('k') | ios/chrome/browser/ui/ntp/recent_tabs/views/signed_in_sync_in_progress_view.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/ui/ntp/recent_tabs/views/show_full_history_view.mm

diff --git a/ios/chrome/browser/ui/ntp/recent_tabs/views/show_full_history_view.mm b/ios/chrome/browser/ui/ntp/recent_tabs/views/show_full_history_view.mm

index c0c2573430fed011502a61e3c1d3ec64f9c7c393..c09b36ba29c6f5b71fd67dfa2fb4b1ef288df787 100644

--- a/ios/chrome/browser/ui/ntp/recent_tabs/views/show_full_history_view.mm

+++ b/ios/chrome/browser/ui/ntp/recent_tabs/views/show_full_history_view.mm

@@ -8,7 +8,7 @@

#import "ios/chrome/browser/ui/ntp/recent_tabs/views/views_utils.h"

#include "ios/chrome/browser/ui/rtl_geometry.h"

#import "ios/chrome/browser/ui/uikit_ui_util.h"

-#import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"

+#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"

#import "ui/base/l10n/l10n_util.h"

#if !defined(__has_feature) || !__has_feature(objc_arc)

@@ -33,7 +33,7 @@ const CGFloat kDesiredHeight = 48;

UILabel* label = [[UILabel alloc] initWithFrame:CGRectZero];

[label setTranslatesAutoresizingMaskIntoConstraints:NO];

- [label setFont:[[MDFRobotoFontLoader sharedInstance] regularFontOfSize:16]];

+ [label setFont:[[MDCTypography fontLoader] regularFontOfSize:16]];

[label setTextAlignment:NSTextAlignmentNatural];

[label setTextColor:recent_tabs::GetTextColorGray()];

[label setText:l10n_util::GetNSString(IDS_HISTORY_SHOWFULLHISTORY_LINK)];