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

Unified Diff: ios/chrome/browser/ui/ntp/incognito_panel_controller.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/ntp/incognito_panel_controller.mm
diff --git a/ios/chrome/browser/ui/ntp/incognito_panel_controller.mm b/ios/chrome/browser/ui/ntp/incognito_panel_controller.mm
index cd938591f8fe665bbd191c48867ee56850416361..4c1a7e5a0ae16f2dc9f2d24b5230b21032e05859 100644
--- a/ios/chrome/browser/ui/ntp/incognito_panel_controller.mm
+++ b/ios/chrome/browser/ui/ntp/incognito_panel_controller.mm
@@ -17,7 +17,7 @@
#import "ios/chrome/browser/ui/url_loader.h"
#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.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 "ios/web/public/referrer.h"
#import "net/base/mac/url_conversions.h"
#include "ui/base/l10n/l10n_util.h"
@@ -86,8 +86,7 @@ const int kLinkColor = 0x03A9F4;
[_containerView addSubview:incognitoImage];
// Title.
- UIFont* titleFont =
- [[MDFRobotoFontLoader sharedInstance] lightFontOfSize:24];
+ UIFont* titleFont = [[MDCTypography fontLoader] lightFontOfSize:24];
base::scoped_nsobject<UILabel> incognitoTabHeading(
[[self labelWithString:l10n_util::GetNSString(IDS_NEW_TAB_OTR_HEADING)
font:titleFont
@@ -95,8 +94,7 @@ const int kLinkColor = 0x03A9F4;
[_containerView addSubview:incognitoTabHeading];
// Description paragraph.
- UIFont* regularFont =
- [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:14];
+ UIFont* regularFont = [[MDCTypography fontLoader] regularFontOfSize:14];
base::scoped_nsobject<UILabel> incognitoTabDescription([[self
labelWithString:l10n_util::GetNSString(IDS_NEW_TAB_OTR_DESCRIPTION)
font:regularFont
@@ -120,8 +118,7 @@ const int kLinkColor = 0x03A9F4;
forState:UIControlStateNormal];
[learnMore setTitleColor:UIColorFromRGB(kLinkColor)
forState:UIControlStateNormal];
- UIFont* buttonFont =
- [[MDFRobotoFontLoader sharedInstance] boldFontOfSize:14];
+ UIFont* buttonFont = [[MDCTypography fontLoader] boldFontOfSize:14];
[[learnMore titleLabel] setFont:buttonFont];
[learnMore addTarget:self
action:@selector(learnMoreButtonPressed)

Powered by Google App Engine
This is Rietveld 408576698