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

Unified Diff: ui/app_list/cocoa/apps_grid_view_item.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 | « no previous file | ui/app_list/cocoa/signin_view_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/cocoa/apps_grid_view_item.mm
diff --git a/ui/app_list/cocoa/apps_grid_view_item.mm b/ui/app_list/cocoa/apps_grid_view_item.mm
index 92e5d1b77ea0fcb1f3aad2d7bcc53d4e0a33084d..0c88d6ce150425e25da89baf704be37ae06994ad 100644
--- a/ui/app_list/cocoa/apps_grid_view_item.mm
+++ b/ui/app_list/cocoa/apps_grid_view_item.mm
@@ -15,7 +15,7 @@
#import "ui/app_list/cocoa/apps_grid_controller.h"
#import "ui/base/cocoa/menu_controller.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/font.h"
+#include "ui/gfx/font_list.h"
#include "ui/gfx/image/image_skia_operations.h"
#include "ui/gfx/image/image_skia_util_mac.h"
#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
@@ -269,8 +269,9 @@ void ItemModelObserverBridge::ItemPercentDownloadedChanged() {
NSDictionary* titleAttributes = @{
NSParagraphStyleAttributeName : paragraphStyle,
NSFontAttributeName : ui::ResourceBundle::GetSharedInstance()
- .GetFont(app_list::kItemTextFontStyle)
- .DeriveFont(kMacFontSizeDelta)
+ .GetFontList(app_list::kItemTextFontStyle)
+ .DeriveWithSizeDelta(kMacFontSizeDelta)
+ .GetPrimaryFont()
.GetNativeFont(),
NSForegroundColorAttributeName : [self isSelected] ?
gfx::SkColorToSRGBNSColor(app_list::kGridTitleHoverColor) :
« no previous file with comments | « no previous file | ui/app_list/cocoa/signin_view_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698