Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ui / app_list / cocoa / signin_view_controller.mm

diff --git a/src/ui/app_list/cocoa/signin_view_controller.mm b/src/ui/app_list/cocoa/signin_view_controller.mm
index e8d2651..bd2023a 100644 (file)
--- a/src/ui/app_list/cocoa/signin_view_controller.mm
+++ b/src/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];