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

Unified Diff: ash/shelf/shelf_view.cc

Issue 117903006: Refactor: Makes menus use gfx::FontList instead of gfx::Font. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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
Index: ash/shelf/shelf_view.cc
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
index 67988af1e955644f50eb0e64ca22b988bf1c6bb8..66edbcd1effa3a3075c1c7818dce5ac96111b29b 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -128,7 +128,7 @@ class ShelfMenuModelAdapter : public views::MenuModelAdapter {
explicit ShelfMenuModelAdapter(ShelfMenuModel* menu_model);
// views::MenuModelAdapter:
- virtual const gfx::Font* GetLabelFont(int command_id) const OVERRIDE;
+ virtual const gfx::FontList* GetLabelFontList(int command_id) const OVERRIDE;
virtual bool IsCommandEnabled(int id) const OVERRIDE;
virtual void GetHorizontalIconMargins(int id,
int icon_size,
@@ -154,12 +154,13 @@ ShelfMenuModelAdapter::ShelfMenuModelAdapter(ShelfMenuModel* menu_model)
menu_model_(menu_model) {
}
-const gfx::Font* ShelfMenuModelAdapter::GetLabelFont(int command_id) const {
+const gfx::FontList* ShelfMenuModelAdapter::GetLabelFontList(
+ int command_id) const {
if (command_id != kCommandIdOfMenuName)
- return MenuModelAdapter::GetLabelFont(command_id);
+ return MenuModelAdapter::GetLabelFontList(command_id);
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- return &rb.GetFont(ui::ResourceBundle::BoldFont);
+ return &rb.GetFontList(ui::ResourceBundle::BoldFont);
}
bool ShelfMenuModelAdapter::IsCommandEnabled(int id) const {
« no previous file with comments | « no previous file | chrome/browser/chromeos/status/network_menu.cc » ('j') | ui/views/controls/menu/menu_config_views.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698