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

Unified Diff: ios/chrome/browser/ui/bookmarks/bookmark_promo_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/bookmarks/bookmark_promo_cell.mm
diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_promo_cell.mm b/ios/chrome/browser/ui/bookmarks/bookmark_promo_cell.mm
index 6b2534dc52fc4627ac7df4816e8ddc4808a7840d..319f817e5785fe4c4ea23484c6be02f081ec8160 100644
--- a/ios/chrome/browser/ui/bookmarks/bookmark_promo_cell.mm
+++ b/ios/chrome/browser/ui/bookmarks/bookmark_promo_cell.mm
@@ -15,7 +15,7 @@
#include "ios/chrome/grit/ios_chromium_strings.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.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 "ui/base/l10n/l10n_util_mac.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -76,8 +76,7 @@ void SetTextWithLineHeight(UILabel* label, NSString* text, CGFloat lineHeight) {
UILabel* titleLabel = [[UILabel alloc] init];
_titleLabel = titleLabel;
_titleLabel.textColor = bookmark_utils_ios::darkTextColor();
- _titleLabel.font =
- [[MDFRobotoFontLoader sharedInstance] mediumFontOfSize:16];
+ _titleLabel.font = [[MDCTypography fontLoader] mediumFontOfSize:16];
_titleLabel.numberOfLines = 0;
SetTextWithLineHeight(_titleLabel,
l10n_util::GetNSString(IDS_IOS_BOOKMARK_PROMO_TITLE),
@@ -89,8 +88,7 @@ void SetTextWithLineHeight(UILabel* label, NSString* text, CGFloat lineHeight) {
UILabel* subtitleLabel = [[UILabel alloc] init];
_subtitleLabel = subtitleLabel;
_subtitleLabel.textColor = bookmark_utils_ios::darkTextColor();
- _subtitleLabel.font =
- [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:14];
+ _subtitleLabel.font = [[MDCTypography fontLoader] regularFontOfSize:14];
_subtitleLabel.numberOfLines = 0;
SetTextWithLineHeight(
_subtitleLabel, l10n_util::GetNSString(IDS_IOS_BOOKMARK_PROMO_MESSAGE),

Powered by Google App Engine
This is Rietveld 408576698