Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(408)

Unified Diff: ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_cell.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
Index: ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_cell.mm
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_cell.mm b/ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_cell.mm
index ec849a6d983b2a6cabaf23e1af79c8fd108ca885..dac81166a732bc1b45d82ee91a1d36f0dba3e236 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_cell.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_cell.mm
@@ -14,7 +14,7 @@
#include "ios/chrome/grit/ios_strings.h"
#include "ios/chrome/grit/ios_theme_resources.h"
#import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.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 "ios/third_party/material_text_accessibility_ios/src/src/MDFTextAccessibility.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/image/image.h"
@@ -167,8 +167,8 @@ CGFloat tabSwitcherLocalSessionCellTopBarHeight() {
// Title label.
_titleLabel = [[UILabel alloc] initWithFrame:CGRectZero];
[_titleLabel setTranslatesAutoresizingMaskIntoConstraints:NO];
- [_titleLabel setFont:[[MDFRobotoFontLoader sharedInstance]
- regularFontOfSize:kFontSize]];
+ [_titleLabel
+ setFont:[[MDCTypography fontLoader] regularFontOfSize:kFontSize]];
[_topBar addSubview:_titleLabel];
// Favicon.
@@ -354,8 +354,8 @@ CGFloat tabSwitcherLocalSessionCellTopBarHeight() {
[_titleLabel setTranslatesAutoresizingMaskIntoConstraints:NO];
[_titleLabel setNumberOfLines:5];
[_titleLabel setTextAlignment:NSTextAlignmentCenter];
- [_titleLabel setFont:[[MDFRobotoFontLoader sharedInstance]
- regularFontOfSize:kFontSize]];
+ [_titleLabel
+ setFont:[[MDCTypography fontLoader] regularFontOfSize:kFontSize]];
[_verticallyCenteredView addSubview:_titleLabel];
// Create and add new tab icon to |_verticallyCenteredContent|.

Powered by Google App Engine
This is Rietveld 408576698