ios/chrome/browser/ui/alert_coordinator/loading_alert_coordinator.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/alert_coordinator/loading_alert_coordinator.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/passwords/password_generation_prompt_view.mm ('k') | ios/chrome/browser/ui/authentication/chrome_signin_view_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/ui/alert_coordinator/loading_alert_coordinator.mm

diff --git a/ios/chrome/browser/ui/alert_coordinator/loading_alert_coordinator.mm b/ios/chrome/browser/ui/alert_coordinator/loading_alert_coordinator.mm

index 8d9d3634c3dbf74c2b557408f1732a90143282e1..35b290938aeed599b60e70d9db6617073b2e74cc 100644

--- a/ios/chrome/browser/ui/alert_coordinator/loading_alert_coordinator.mm

+++ b/ios/chrome/browser/ui/alert_coordinator/loading_alert_coordinator.mm

@@ -14,7 +14,7 @@

#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"

#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"

#import "ios/third_party/material_components_ios/src/components/Dialogs/src/MaterialDialogs.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"

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

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

@@ -119,7 +119,7 @@ const CGFloat kPrefHeight = 300;

// Title.

NSMutableDictionary* attrsDictionary = [NSMutableDictionary

- dictionaryWithObject:[[MDFRobotoFontLoader sharedInstance]

+ dictionaryWithObject:[[MDCTypography fontLoader]

mediumFontOfSize:kTitleLabelFontSize]

forKey:NSFontAttributeName];

[attrsDictionary setObject:UIColorFromRGB(kTitleLabelFontColor)