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

Unified Diff: ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm

Issue 2912863005: Use MDCTypography instead of MDFRobotoFontLoader directly. (Closed)
Patch Set: Revert main_controller 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/cells/bookmark_parent_folder_item.mm
diff --git a/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm b/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm
index a78aa4f9f7f5f34ce744bc6dc7f2ee95e0055f02..3ec43b4fc86832545549af6fb1b22f7f3cc7ef0e 100644
--- a/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm
+++ b/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm
@@ -8,7 +8,7 @@
#import "ios/chrome/browser/ui/icons/chrome_icon.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h"
#include "ios/chrome/grit/ios_strings.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)
@@ -62,15 +62,13 @@
_decorationLabel = [[UILabel alloc] init];
_decorationLabel.translatesAutoresizingMaskIntoConstraints = NO;
_decorationLabel.text = l10n_util::GetNSString(IDS_IOS_BOOKMARK_GROUP_BUTTON);
- _decorationLabel.font =
- [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:12];
+ _decorationLabel.font = [MDCTypography captionFont];
_decorationLabel.textColor = bookmark_utils_ios::lightTextColor();
[self.contentView addSubview:_decorationLabel];
_parentFolderNameLabel = [[UILabel alloc] init];
_parentFolderNameLabel.translatesAutoresizingMaskIntoConstraints = NO;
- _parentFolderNameLabel.font =
- [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:16];
+ _parentFolderNameLabel.font = [MDCTypography subheadFont];
_parentFolderNameLabel.textColor =
[UIColor colorWithWhite:33.0 / 255.0 alpha:1.0];
_parentFolderNameLabel.textAlignment = NSTextAlignmentNatural;

Powered by Google App Engine
This is Rietveld 408576698