| Index: ui/app_list/cocoa/signin_view_controller.mm
|
| diff --git a/ui/app_list/cocoa/signin_view_controller.mm b/ui/app_list/cocoa/signin_view_controller.mm
|
| index e8d26516d2d8b82519c6c2be778c0d31d2e78c66..bd2023ac8df9713b78992f73cd21012835fecf6b 100644
|
| --- a/ui/app_list/cocoa/signin_view_controller.mm
|
| +++ b/ui/app_list/cocoa/signin_view_controller.mm
|
| @@ -131,10 +131,12 @@ const CGFloat kTextFieldPadding = 2;
|
| NSView* signinView = [self view];
|
| NSRect frame = [signinView frame];
|
| ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| - gfx::Font baseFont = rb.GetFont(ui::ResourceBundle::BaseFont);
|
| + const gfx::FontList& baseFontList =
|
| + rb.GetFontList(ui::ResourceBundle::BaseFont);
|
|
|
| NSString* titleText = base::SysUTF16ToNSString(delegate_->GetSigninHeading());
|
| - NSFont* titleFont = baseFont.DeriveFont(kTitleFontSizeDelta).GetNativeFont();
|
| + NSFont* titleFont = baseFontList.DeriveWithSizeDelta(kTitleFontSizeDelta)
|
| + .GetPrimaryFont().GetNativeFont();
|
| NSRect rect = NSMakeRect(kLeftPadding, NSHeight(frame) - kTopPadding,
|
| NSWidth(frame) - kLeftPadding - kRightPadding, 0);
|
| NSTextField* titleTextView = [self makeTextFieldWithText:titleText
|
| @@ -145,7 +147,7 @@ const CGFloat kTextFieldPadding = 2;
|
| NSString* signinText = base::SysUTF16ToNSString(delegate_->GetSigninText());
|
| rect.origin.y = floor(
|
| NSMinY([titleTextView frame]) + [titleFont descender] - kHeadingPadding);
|
| - NSFont* signinTextFont = baseFont.GetNativeFont();
|
| + NSFont* signinTextFont = baseFontList.GetPrimaryFont().GetNativeFont();
|
| NSTextField* signinTextView = [self makeTextFieldWithText:signinText
|
| font:signinTextFont
|
| frame:rect];
|
|
|