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

Unified Diff: ui/app_list/cocoa/signin_view_controller.mm

Issue 151693004: Clean-up: Replaces obsolete Font/FontList methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced. Created 6 years, 10 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 | « ui/app_list/cocoa/apps_grid_view_item.mm ('k') | ui/app_list/views/signin_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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];
« no previous file with comments | « ui/app_list/cocoa/apps_grid_view_item.mm ('k') | ui/app_list/views/signin_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698