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

Unified Diff: ios/chrome/browser/passwords/password_generation_prompt_view.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
« no previous file with comments | « no previous file | ios/chrome/browser/ui/alert_coordinator/loading_alert_coordinator.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/passwords/password_generation_prompt_view.mm
diff --git a/ios/chrome/browser/passwords/password_generation_prompt_view.mm b/ios/chrome/browser/passwords/password_generation_prompt_view.mm
index bc543260ea9e87ea44d09b0b7273da5fb7487d50..5f7ef740b3463c117d484978cde868047e1ed71e 100644
--- a/ios/chrome/browser/passwords/password_generation_prompt_view.mm
+++ b/ios/chrome/browser/passwords/password_generation_prompt_view.mm
@@ -18,7 +18,7 @@
#include "ios/chrome/grit/ios_strings.h"
#include "ios/chrome/grit/ios_theme_resources.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"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -184,7 +184,7 @@ const CGFloat kDescriptionLabelTopPadding = 10.0f;
- (UILabel*)titleLabel {
NSMutableDictionary* attrsDictionary = [NSMutableDictionary
- dictionaryWithObject:[[MDFRobotoFontLoader sharedInstance]
+ dictionaryWithObject:[[MDCTypography fontLoader]
mediumFontOfSize:kTitleLabelFontSize]
forKey:NSFontAttributeName];
[attrsDictionary setObject:UIColorFromRGB(kTitleLabelFontColor)
@@ -206,7 +206,7 @@ const CGFloat kDescriptionLabelTopPadding = 10.0f;
base::scoped_nsobject<UILabel> passwordLabel([[UILabel alloc] init]);
[passwordLabel setText:password];
[passwordLabel setTextColor:UIColorFromRGB(kPasswordLabelFontColor)];
- [passwordLabel setFont:[[MDFRobotoFontLoader sharedInstance]
+ [passwordLabel setFont:[[MDCTypography fontLoader]
regularFontOfSize:kPasswordLabelFontSize]];
[passwordLabel setNumberOfLines:1];
[passwordLabel sizeToFit];
@@ -228,7 +228,7 @@ const CGFloat kDescriptionLabelTopPadding = 10.0f;
UIColorFromRGB(kDescriptionLabelFontColor),
NSForegroundColorAttributeName, paragraphStyle.get(),
NSParagraphStyleAttributeName,
- [[MDFRobotoFontLoader sharedInstance]
+ [[MDCTypography fontLoader]
regularFontOfSize:kDescriptionLabelFontSize],
NSFontAttributeName, nil];
« no previous file with comments | « no previous file | ios/chrome/browser/ui/alert_coordinator/loading_alert_coordinator.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698