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

Unified Diff: ios/chrome/browser/ui/history/history_entry_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/history/history_entry_item.mm
diff --git a/ios/chrome/browser/ui/history/history_entry_item.mm b/ios/chrome/browser/ui/history/history_entry_item.mm
index e4806c6c00e975976fcffe31c800c54dbdeae13e..08bb6d12a989b19223376de6489ad360cdcba1d1 100644
--- a/ios/chrome/browser/ui/history/history_entry_item.mm
+++ b/ios/chrome/browser/ui/history/history_entry_item.mm
@@ -19,7 +19,7 @@
#import "ios/chrome/browser/ui/uikit_ui_util.h"
#include "ios/chrome/grit/ios_strings.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"
#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -240,18 +240,16 @@ NSString* FormattedTitle(const base::string16& title, const GURL& url) {
_faviconViewContainer = [[UIView alloc] initWithFrame:CGRectZero];
_textLabel = [[UILabel alloc] initWithFrame:CGRectZero];
- [_textLabel
- setFont:[[MDFRobotoFontLoader sharedInstance] mediumFontOfSize:16]];
+ [_textLabel setFont:[[MDCTypography fontLoader] mediumFontOfSize:16]];
[_textLabel setTextColor:[[MDCPalette greyPalette] tint900]];
_detailTextLabel = [[UILabel alloc] initWithFrame:CGRectZero];
[_detailTextLabel
- setFont:[[MDFRobotoFontLoader sharedInstance] regularFontOfSize:14]];
+ setFont:[[MDCTypography fontLoader] regularFontOfSize:14]];
[_detailTextLabel setTextColor:[[MDCPalette greyPalette] tint600]];
_timeLabel = [[UILabel alloc] initWithFrame:CGRectZero];
- [_timeLabel
- setFont:[[MDFRobotoFontLoader sharedInstance] mediumFontOfSize:14]];
+ [_timeLabel setFont:[[MDCTypography fontLoader] mediumFontOfSize:14]];
[_timeLabel setTextColor:[[MDCPalette greyPalette] tint600]];
_timeLabel.textAlignment =
UseRTLLayout() ? NSTextAlignmentLeft : NSTextAlignmentRight;
« no previous file with comments | « ios/chrome/browser/ui/history/favicon_view_provider.mm ('k') | ios/chrome/browser/ui/history/tab_history_cell.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698