ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_view_controller.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/settings/sync_encryption_passphrase_collection_view_controller.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/settings/cells/version_item.mm ('k') | ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_cell.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_view_controller.mm b/ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_view_controller.mm

index 71b7c411bac8037ed164bd7f0b2f34dc53ebce22..5c1f13d5e4b6da5f73ba0c7edb8a3688d0397c16 100644

--- a/ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_view_controller.mm

+++ b/ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_view_controller.mm

@@ -39,7 +39,6 @@

#include "ios/chrome/grit/ios_strings.h"

#import "ios/public/provider/chrome/browser/signin/chrome_identity.h"

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

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

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

#include "ui/base/l10n/l10n_util_mac.h"

#include "url/gurl.h"

@@ -320,7 +319,7 @@ const CGFloat kSpinnerButtonPadding = 18;

CardMultilineCell* messageCell =

base::mac::ObjCCastStrict<CardMultilineCell>(cell);

messageCell.textLabel.font =

- [[MDFRobotoFontLoader sharedInstance] mediumFontOfSize:14];

+ [[MDCTypography fontLoader] mediumFontOfSize:14];

}

return cell;

}