ios/chrome/browser/ui/contextual_search/contextual_search_promo_view.mm - Issue 2912863005: Use MDCTypography instead of MDFRobotoFontLoader directly.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/chrome/browser/ui/contextual_search/contextual_search_promo_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 | « ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.mm ('k') | ios/chrome/browser/ui/downloads/download_manager_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/ui/contextual_search/contextual_search_promo_view.mm

diff --git a/ios/chrome/browser/ui/contextual_search/contextual_search_promo_view.mm b/ios/chrome/browser/ui/contextual_search/contextual_search_promo_view.mm

index d7209692c03e32a51577b71cb8e38c95ab330772..f1564002afca8ba3625a4dcec4733f1d38b55f6f 100644

--- a/ios/chrome/browser/ui/contextual_search/contextual_search_promo_view.mm

+++ b/ios/chrome/browser/ui/contextual_search/contextual_search_promo_view.mm

@@ -12,7 +12,7 @@

#include "ios/chrome/common/string_util.h"

#include "ios/chrome/grit/ios_strings.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 "url/gurl.h"

@@ -95,7 +95,7 @@ const CGFloat kCloseDuration = ios::material::kDuration1;

NSDictionary* attributes = @{

NSParagraphStyleAttributeName : paragraphStyle,

NSFontAttributeName :

- [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:kTextFontSize],

+ [[MDCTypography fontLoader] regularFontOfSize:kTextFontSize],

NSForegroundColorAttributeName :

[UIColor colorWithWhite:kTextColorGrayShade alpha:1]

};

@@ -111,7 +111,7 @@ const CGFloat kCloseDuration = ios::material::kDuration1;

text.numberOfLines = 0;

UIFont* buttonFont =

- [[MDFRobotoFontLoader sharedInstance] mediumFontOfSize:kButtonFontSize];

+ [[MDCTypography fontLoader] mediumFontOfSize:kButtonFontSize];

// Create accept and decline buttons with dimensions defined by the

// minimum height and width constants.