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

Unified Diff: ios/chrome/browser/ui/settings/cells/text_and_error_item.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/settings/cells/text_and_error_item.mm
diff --git a/ios/chrome/browser/ui/settings/cells/text_and_error_item.mm b/ios/chrome/browser/ui/settings/cells/text_and_error_item.mm
index 4adf9d6857b459edce6b64b0aadf28b00de197a7..7281b08ad68a1906ca842b235de7a8ba499dae2e 100644
--- a/ios/chrome/browser/ui/settings/cells/text_and_error_item.mm
+++ b/ios/chrome/browser/ui/settings/cells/text_and_error_item.mm
@@ -6,7 +6,7 @@
#include "base/mac/foundation_util.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"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
@@ -89,8 +89,7 @@ const CGFloat kHorizontalErrorIconFixedSize = 25;
self.contentView.clipsToBounds = YES;
_textLabel = [[UILabel alloc] init];
_textLabel.translatesAutoresizingMaskIntoConstraints = NO;
- _textLabel.font =
- [[MDFRobotoFontLoader sharedInstance] mediumFontOfSize:14];
+ _textLabel.font = [[MDCTypography fontLoader] mediumFontOfSize:14];
_textLabel.textColor = [[MDCPalette greyPalette] tint900];
_textLabel.numberOfLines = 0;
[self.contentView addSubview:_textLabel];
« no previous file with comments | « ios/chrome/browser/ui/settings/cells/sync_switch_item.mm ('k') | ios/chrome/browser/ui/settings/cells/version_item.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698