ios/chrome/browser/ui/toolbar/toolbar_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/toolbar/toolbar_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:

Index: ios/chrome/browser/ui/toolbar/toolbar_controller.mm

diff --git a/ios/chrome/browser/ui/toolbar/toolbar_controller.mm b/ios/chrome/browser/ui/toolbar/toolbar_controller.mm

index b21d58076d5e1eabba4fc969aff08dcd9f50eef9..9ceeae4ac4308046ee588ca61fe4a70f1381f3f1 100644

--- a/ios/chrome/browser/ui/toolbar/toolbar_controller.mm

+++ b/ios/chrome/browser/ui/toolbar/toolbar_controller.mm

@@ -33,7 +33,7 @@

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

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

#import "ios/shared/chrome/browser/ui/tools_menu/tools_menu_configuration.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"

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

#error "This file requires ARC support."

@@ -403,7 +403,7 @@ const LayoutOffset kButtonFadeOutXOffset = 10;

}

- (UIFont*)fontForSize:(NSInteger)size {

- return [[MDFRobotoFontLoader sharedInstance] boldFontOfSize:size];

+ return [[MDCTypography fontLoader] boldFontOfSize:size];

}

- (void)dealloc {