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/ntp/whats_new_header_view.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/ntp/whats_new_header_view.mm
diff --git a/ios/chrome/browser/ui/ntp/whats_new_header_view.mm b/ios/chrome/browser/ui/ntp/whats_new_header_view.mm
index 96301ef41bb02aca30bb565aef07ebdd9f0921a5..ae4a2d4d597c5e74fded87a43df1cb80cfbc89e3 100644
--- a/ios/chrome/browser/ui/ntp/whats_new_header_view.mm
+++ b/ios/chrome/browser/ui/ntp/whats_new_header_view.mm
@@ -10,7 +10,7 @@
#include "ios/chrome/common/string_util.h"
#include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
#include "ios/public/provider/chrome/browser/images/branded_image_provider.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"
namespace {
@@ -18,7 +18,6 @@ const CGFloat kLabelTopMargin = 16;
const CGFloat kLabelBottomMargin = 24;
const CGFloat kLabelLineSpacing = 4;
const CGFloat kLabelLeftMargin = 8;
-const CGFloat kLabelFontSize = 14;
const CGFloat kInfoIconSize = 24;
const CGFloat kInfoIconTopMargin = 12;
@@ -183,8 +182,7 @@ const int kLinkColorRgb = 0x5595FE;
+ (UILabel*)promoLabel {
base::scoped_nsobject<UILabel> promoLabel(
[[UILabel alloc] initWithFrame:CGRectZero]);
- [promoLabel setFont:[[MDFRobotoFontLoader sharedInstance]
- regularFontOfSize:kLabelFontSize]];
+ [promoLabel setFont:[MDCTypography body1Font]];
[promoLabel setTextColor:UIColorFromRGB(kTextColorRgb, 1.0)];
[promoLabel setNumberOfLines:0];
[promoLabel setTextAlignment:NSTextAlignmentNatural];

Powered by Google App Engine
This is Rietveld 408576698