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/autofill/storage_switch_tooltip.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/autofill/storage_switch_tooltip.mm
diff --git a/ios/chrome/browser/ui/autofill/storage_switch_tooltip.mm b/ios/chrome/browser/ui/autofill/storage_switch_tooltip.mm
index fc266c76a409f8061553e6514af9d86bd48d3a0b..f7b563f4e40dbbdd08a7eecf6d972bd07e9964ad 100644
--- a/ios/chrome/browser/ui/autofill/storage_switch_tooltip.mm
+++ b/ios/chrome/browser/ui/autofill/storage_switch_tooltip.mm
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "components/strings/grit/components_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.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -16,7 +16,6 @@
namespace {
const CGFloat kCornerRadius = 2.0f;
-const CGFloat kFontSize = 12.0f;
const CGFloat kInset = 8.0f;
} // namespace
@@ -33,8 +32,7 @@ const CGFloat kInset = 8.0f;
[self setBackgroundColor:[UIColor colorWithWhite:0.0 alpha:0.9]];
[[self layer] setCornerRadius:kCornerRadius];
[[self layer] setMasksToBounds:YES];
- [self setFont:[[MDFRobotoFontLoader sharedInstance]
- regularFontOfSize:kFontSize]];
+ [self setFont:[MDCTypography captionFont]];
[self setNumberOfLines:0]; // Allows multi-line layout.
}
return self;

Powered by Google App Engine
This is Rietveld 408576698